mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4293 from owncloud/config-date 

make log date configurable, default to iso 8601
This commit is contained in:
Thomas Müller 2013-08-04 15:18:05 -07:00
parent b5f18111f4 33d78ab9c7
commit d1a39ab01c
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/config.sample.php
View File

@ -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'
);

10
lib/log/owncloud.php
View File

@ -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) {