From bbe779ce2c0f73cb59960b01efc60a19287bd589 Mon Sep 17 00:00:00 2001
From: mboelen <michael@cisofy.com>
Date: Tue, 3 Feb 2015 18:05:09 +0100
Subject: [PATCH] Improve logging

---
 lynis | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lynis b/lynis
index 2487ee5e..919fa1ba 100755
--- a/lynis
+++ b/lynis
@@ -23,7 +23,7 @@
     # Program information
     PROGRAM_name="Lynis"
     PROGRAM_version="1.6.5"
-    PROGRAM_releasedate="30 January 2015"
+    PROGRAM_releasedate="3 February 2015"
     PROGRAM_author="CISOfy"
     PROGRAM_author_contact="development@cisofy.com"
     PROGRAM_website="https://cisofy.com"
@@ -827,15 +827,10 @@
     logtext "Active plugins:      ${N_PLUGIN_ENABLED}"
     logtext "Total plugins:       ${N_PLUGIN}"
     logtext "================================================================================"
-    logtext "${PROGRAM_name} ${PROGRAM_version}"
-    logtext "${PROGRAM_copyright}"
-    logtext "${PROGRAM_extrainfo}"
-    logtext "Program ended successfully"
     report "tests_executed=${TESTS_EXECUTED}"
     report "tests_skipped=${TESTS_SKIPPED}"
     report "finish=true"
 
-
     # Upload data
     if [ ${UPLOAD_DATA} -eq 1 ]; then
         if [ -f ${INCLUDEDIR}/data_upload ]; then
@@ -846,6 +841,12 @@
         fi
     fi
 
+    logtext "${PROGRAM_name} ${PROGRAM_version}"
+    logtext "${PROGRAM_copyright}"
+    logtext "${PROGRAM_extrainfo}"
+    logtext "Program ended successfully"
+    logtext "================================================================================"
+
     # Clean exit (Delete PID file)
     ExitClean