From ab17ee4a5ac332d91581bc2235134dbe1d93d582 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 19 Mar 2010 15:12:42 -0600
Subject: [PATCH] Add support for ident and time_format log options.

---
 framework/Core/lib/Horde/Core/Binder/Logger.php |  1 +
 framework/Core/lib/Horde/Core/Log/Logger.php    | 16 ++++++++++++----
 horde/config/conf.xml                           | 13 ++++++++-----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/framework/Core/lib/Horde/Core/Binder/Logger.php b/framework/Core/lib/Horde/Core/Binder/Logger.php
index 5d6c75a1f..9b2ade0d7 100644
--- a/framework/Core/lib/Horde/Core/Binder/Logger.php
+++ b/framework/Core/lib/Horde/Core/Binder/Logger.php
@@ -23,6 +23,7 @@ class Horde_Core_Binder_Logger implements Horde_Injector_Binder
                 break;
 
             case 'default':
+            default:
                 // Use Horde_Log defaults.
                 $formatter = null;
                 break;
diff --git a/framework/Core/lib/Horde/Core/Log/Logger.php b/framework/Core/lib/Horde/Core/Log/Logger.php
index 4a059952a..8aab63eb9 100644
--- a/framework/Core/lib/Horde/Core/Log/Logger.php
+++ b/framework/Core/lib/Horde/Core/Log/Logger.php
@@ -86,7 +86,10 @@ class Horde_Core_Log_Logger extends Horde_Log_Logger
             ? $GLOBALS['registry']->getApp()
             : 'horde';
 
-        $message = ($app ? '[' . $app . '] ' : '') . $text . ' [pid ' . getmypid() . ' on line ' . $line . ' of "' . $file . '"]';
+        $message = (empty($GLOBALS['conf']['log']['ident']) ? $GLOBALS['conf']['log']['ident'] . ' ' : '') .
+            ($app ? '[' . $app . '] ' : '') .
+            $text .
+            ' [pid ' . getmypid() . ' on line ' . $line . ' of "' . $file . '"]';
 
         if (is_string($priority)) {
             $priority = defined('Horde_Log::' . $priority)
@@ -101,11 +104,16 @@ class Horde_Core_Log_Logger extends Horde_Log_Logger
         $tz = getenv('TZ');
         @putenv('TZ');
 
-        parent::log(array(
+        $eventob = array(
             'level' => $priority,
             'message' => $message,
-            //'timestamp'
-        ));
+        );
+
+        if (!empty($GLOBALS['conf']['log']['time_format'])) {
+            $eventob['timestamp'] = date($GLOBALS['conf']['log']['time_format']);
+        }
+
+        parent::log($eventob);
 
         /* Restore original locale and timezone. */
         // TODO: Needed?
diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index 98f86cc47..852435f99 100644
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -742,17 +742,20 @@
        <value desc="DEBUG">DEBUG</value>
       </values>
      </configenum>
-     <configstring name="ident" desc="What identifier should we use in the
-     logs?">HORDE</configstring>
+     <configstring name="ident" required="false" desc="What identifier should
+     we use in the logs?">HORDE</configstring>
+     <configstring name="time_format" required="false" desc="What time format
+     should we use in the logs? (Acceptable formats are the inputs to PHP's
+     date() function). Leave blank to use the default."></configstring>
 
      <configswitch name="type" desc="What log driver should we use?">file
       <case name="file" desc="File">
        <configstring name="name" desc="Path to the log
        file">/tmp/horde.log</configstring>
        <configsection name="params">
-        <configboolean name="append" required="false" desc="Should new log
-        entries be appended to an existing log file? If this is false, new log
-        files will overwrite existing ones.">true</configboolean>
+        <configboolean name="append" desc="Should new log entries be appended
+        to an existing log file? If this is false, new log files will
+        overwrite existing ones.">true</configboolean>
         <configswitch name="format" required="false" desc="What format should
         the log entries be in?">default
          <case name="custom" desc="Custom Template">
-- 
2.11.0