diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-04 15:18:05 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-04 15:18:05 -0700 |
| commit | d1a39ab01ca071aa762c83b0e642c21996ff45e8 (patch) | |
| tree | 5c474b1ec5822ab992dcac5c0a880bba420008b6 | |
| parent | b5f18111f4897cfb4c9dfb517bc6b80ce2b6a8ac (diff) | |
| parent | 33d78ab9c719ac0677651cfe76bf6a2aa3073241 (diff) | |
| download | nextcloud-server-d1a39ab01ca071aa762c83b0e642c21996ff45e8.tar.gz nextcloud-server-d1a39ab01ca071aa762c83b0e642c21996ff45e8.zip | |
Merge pull request #4293 from owncloud/config-date
make log date configurable, default to iso 8601
| -rw-r--r-- | config/config.sample.php | 5 | ||||
| -rw-r--r-- | lib/log/owncloud.php | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index c6d7fa0d05b..24ba541ac5c 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -188,5 +188,8 @@ $CONFIG = array( //links to custom clients 'customclient_desktop' => '', //http://owncloud.org/sync-clients/ 'customclient_android' => '', //https://play.google.com/store/apps/details?id=com.owncloud.android -'customclient_ios' => '' //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8 +'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8 + +// date format to be used while writing to the owncloud logfile +'logdateformat' => 'F d, Y H:i:s' ); diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php index 7a11a588330..d16b9537a16 100644 --- a/lib/log/owncloud.php +++ b/lib/log/owncloud.php @@ -44,12 +44,14 @@ class OC_Log_Owncloud { * write a message in the log * @param string $app * @param string $message - * @param int level + * @param int $level */ public static function write($app, $message, $level) { $minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR); if($level>=$minLevel) { - $time = date("F d, Y H:i:s", time()); + // default to ISO8601 + $format = OC_Config::getValue('logdateformat', 'c'); + $time = date($format, time()); $entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=> $time); $handle = @fopen(self::$logFile, 'a'); if ($handle) { @@ -61,8 +63,8 @@ class OC_Log_Owncloud { /** * get entries from the log in reverse chronological order - * @param int limit - * @param int offset + * @param int $limit + * @param int $offset * @return array */ public static function getEntries($limit=50, $offset=0) { |