From fa566f94cf5a491ce5f06e9b9edcc5d39edd05f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= Date: Thu, 18 May 2017 00:11:10 +0200 Subject: [PATCH 6/6] Revert "ocf_log: use same log format as pacemaker" This reverts commit 75816393878bf063a8c3404b5c747868024e1097. --- heartbeat/ocf-directories.in | 2 +- heartbeat/ocf-shellfuncs.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/heartbeat/ocf-directories.in b/heartbeat/ocf-directories.in index f734162e..7246e088 100644 --- a/heartbeat/ocf-directories.in +++ b/heartbeat/ocf-directories.in @@ -13,7 +13,7 @@ exec_prefix=@exec_prefix@ : ${HA_FIFO:=@localstatedir@/lib/heartbeat/fifo} : ${HA_BIN:=@libdir@/heartbeat} : ${HA_SBIN_DIR:=@sbindir@} -: ${HA_DATEFMT:="%b %d %T "} +: ${HA_DATEFMT:="%Y/%m/%d_%T "} : ${HA_DEBUGLOG:=/dev/null} : ${HA_RESOURCEDIR:=$HA_DIR/resource.d} : ${HA_DOCDIR:=@datadir@/doc/heartbeat} diff --git a/heartbeat/ocf-shellfuncs.in b/heartbeat/ocf-shellfuncs.in index 4a74e201..a0716bb6 100644 --- a/heartbeat/ocf-shellfuncs.in +++ b/heartbeat/ocf-shellfuncs.in @@ -231,7 +231,7 @@ __ha_log() { [ -n "$HA_LOGFILE" ] then : appending to $HA_LOGFILE - echo `hadate`" $HA_LOGTAG: ${*}" >> $HA_LOGFILE + echo "$HA_LOGTAG: "`hadate`"${*}" >> $HA_LOGFILE fi if [ -z "$HA_LOGFACILITY" -a -z "$HA_LOGFILE" ] && ! [ "$ignore_stderr" = "true" ] -- 2.12.2