Set log date to similar format as normal log entries

This commit is contained in:
Michael Boelen 2016-07-11 10:32:14 +02:00
parent 52317de56c
commit a8d8d40f88

8
lynis
View File

@ -32,7 +32,7 @@
PROGRAM_AUTHOR_CONTACT="lynis-dev@cisofy.com" PROGRAM_AUTHOR_CONTACT="lynis-dev@cisofy.com"
# Version details # Version details
PROGRAM_RELEASE_DATE="2016-06-30" PROGRAM_RELEASE_DATE="2016-07-11"
PROGRAM_RELEASE_TIMESTAMP=1467279295 PROGRAM_RELEASE_TIMESTAMP=1467279295
PROGRAM_RELEASE_TYPE="dev" # dev or final PROGRAM_RELEASE_TYPE="dev" # dev or final
PROGRAM_VERSION="2.2.1" PROGRAM_VERSION="2.2.1"
@ -473,7 +473,8 @@ ${NORMAL}
################################################################################# #################################################################################
# #
# Clear log file and test if it's writable # Clear log file and test if it's writable
echo "### Starting ${PROGRAM_NAME} ${PROGRAM_VERSION} with PID ${OURPID}, build date ${PROGRAM_RELEASE_DATE} ###" > ${LOGFILE} CDATE=$(date "+%Y-%m-%d %H:%M:%S")
echo "${CDATE} Starting ${PROGRAM_NAME} ${PROGRAM_VERSION} with PID ${OURPID}, build date ${PROGRAM_RELEASE_DATE}" > ${LOGFILE}
if [ $? -gt 0 ]; then if [ $? -gt 0 ]; then
Display --indent 2 --text "- Clearing log file (${LOGFILE})... " --result WARNING --color RED Display --indent 2 --text "- Clearing log file (${LOGFILE})... " --result WARNING --color RED
echo "${WARNING}Fatal error${NORMAL}: problem while writing to log file. Check location and permissions." echo "${WARNING}Fatal error${NORMAL}: problem while writing to log file. Check location and permissions."
@ -496,6 +497,9 @@ ${NORMAL}
Report "os_fullname=${OS_FULLNAME}" Report "os_fullname=${OS_FULLNAME}"
Report "os_version=${OS_VERSION}" Report "os_version=${OS_VERSION}"
if [ "${OS}" = "Linux" ]; then Report "linux_version=${LINUX_VERSION}"; fi if [ "${OS}" = "Linux" ]; then Report "linux_version=${LINUX_VERSION}"; fi
if [ ! -z "${OS_KERNELVERSION}" ]; then Report "os_kernel_version=${OS_KERNELVERSION}"; fi
if [ ! -z "${OS_KERNELVERSION_FULL}" ]; then Report "os_kernel_version_full=${OS_KERNELVERSION_FULL}"; fi
Report "hostname=${HOSTNAME}" Report "hostname=${HOSTNAME}"
if [ "${HOSTNAME}" = "" ]; then if [ "${HOSTNAME}" = "" ]; then