Skip to content
Snippets Groups Projects
Commit 68c0d545 authored by Bart Visscher's avatar Bart Visscher
Browse files

Merge pull request #3268 from owncloud/convert-oc_log 

Convert OC_Log to object so it can be used for DI
parents d2f50bc0 1edf01d0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lib/legacy/log.php 0 → 100644
+ 77
− 0
View file @ 68c0d545
<?php
/**
* Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
/**
* logging utilities
*
* Log is saved by default at data/owncloud.log using OC_Log_Owncloud.
* Selecting other backend is done with a config option 'log_type'.
*/
OC_Log::$object = new \OC\Log();
class OC_Log {
public static $object;
const DEBUG=0;
const INFO=1;
const WARN=2;
const ERROR=3;
const FATAL=4;
static private $level_funcs = array(
self::DEBUG => 'debug',
self::INFO => 'info',
self::WARN => 'warning',
self::ERROR => 'error',
self::FATAL => 'emergency',
);
static public $enabled = true;
static protected $class = null;
/**
* write a message in the log
* @param string $app
* @param string $message
* @param int $level
*/
public static function write($app, $message, $level) {
if (self::$enabled) {
$context = array('app' => $app);
$func = array(self::$object, self::$level_funcs[$level]);
call_user_func($func, $message, $context);
}
}
//Fatal errors handler
public static function onShutdown() {
$error = error_get_last();
if($error) {
//ob_end_clean();
self::write('PHP', $error['message'] . ' at ' . $error['file'] . '#' . $error['line'], self::FATAL);
} else {
return true;
}
}
// Uncaught exception handler
public static function onException($exception) {
self::write('PHP',
$exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(),
self::FATAL);
}
//Recoverable errors handler
public static function onError($number, $message, $file, $line) {
if (error_reporting() === 0) {
return;
}
self::write('PHP', $message . ' at ' . $file . '#' . $line, self::WARN);
}
}
lib/log.php
+ 110
− 43
View file @ 68c0d545
<?php <?php
/** /**
* Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl> * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
* This file is licensed under the Affero General Public License version 3 or * This file is licensed under the Affero General Public License version 3 or
* later. * later.
* See the COPYING-README file. * See the COPYING-README file.
*/ */
namespace OC;
/** /**
* logging utilities * logging utilities
* *
* Log is saved by default at data/owncloud.log using OC_Log_Owncloud. * This is a stand in, this should be replaced by a Psr\Log\LoggerInterface
* Selecting other backend is done with a config option 'log_type'. * compatible logger. See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
* for the full interface specification.
*
* MonoLog is an example implementing this interface.
*/ */
class OC_Log { class Log {
const DEBUG=0; private $logClass;
const INFO=1;
const WARN=2;
const ERROR=3;
const FATAL=4;
static public $enabled = true; /**
static protected $class = null; * System is unusable.
*
* @param string $message
* @param array $context
*/
public function emergency($message, array $context = array()) {
$this->log(\OC_Log::FATAL, $message, $context);
}
/** /**
* write a message in the log * Action must be taken immediately.
* @param string $app *
* Example: Entire website down, database unavailable, etc. This should
* trigger the SMS alerts and wake you up.
*
* @param string $message * @param string $message
* @param int level * @param array $context
*/ */
public static function write($app, $message, $level) { public function alert($message, array $context = array()) {
if (self::$enabled) { $this->log(\OC_Log::ERROR, $message, $context);
if (!self::$class) {
self::$class = 'OC_Log_'.ucfirst(OC_Config::getValue('log_type', 'owncloud'));
call_user_func(array(self::$class, 'init'));
}
$log_class=self::$class;
$log_class::write($app, $message, $level);
}
} }
//Fatal errors handler /**
public static function onShutdown() { * Critical conditions.
$error = error_get_last(); *
if($error) { * Example: Application component unavailable, unexpected exception.
//ob_end_clean(); *
self::write('PHP', $error['message'] . ' at ' . $error['file'] . '#' . $error['line'], self::FATAL); * @param string $message
} else { * @param array $context
return true; */
} public function critical($message, array $context = array()) {
$this->log(\OC_Log::ERROR, $message, $context);
} }
// Uncaught exception handler /**
public static function onException($exception) { * Runtime errors that do not require immediate action but should typically
self::write('PHP', * be logged and monitored.
$exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(), *
self::FATAL); * @param string $message
* @param array $context
*/
public function error($message, array $context = array()) {
$this->log(\OC_Log::ERROR, $message, $context);
} }
//Recoverable errors handler /**
public static function onError($number, $message, $file, $line) { * Exceptional occurrences that are not errors.
if (error_reporting() === 0) { *
return; * Example: Use of deprecated APIs, poor use of an API, undesirable things
} * that are not necessarily wrong.
self::write('PHP', $message . ' at ' . $file . '#' . $line, self::WARN); *
* @param string $message
* @param array $context
*/
public function warning($message, array $context = array()) {
$this->log(\OC_Log::WARN, $message, $context);
}
/**
* Normal but significant events.
*
* @param string $message
* @param array $context
*/
public function notice($message, array $context = array()) {
$this->log(\OC_Log::INFO, $message, $context);
}
/**
* Interesting events.
*
* Example: User logs in, SQL logs.
*
* @param string $message
* @param array $context
*/
public function info($message, array $context = array()) {
$this->log(\OC_Log::INFO, $message, $context);
}
/**
* Detailed debug information.
*
* @param string $message
* @param array $context
*/
public function debug($message, array $context = array()) {
$this->log(\OC_Log::DEBUG, $message, $context);
}
public function __construct() {
$this->logClass = 'OC_Log_'.ucfirst(\OC_Config::getValue('log_type', 'owncloud'));
call_user_func(array($this->logClass, 'init'));
}
/**
* Logs with an arbitrary level.
*
* @param mixed $level
* @param string $message
* @param array $context
*/
public function log($level, $message, array $context = array()) {
if (isset($context['app'])) {
$app = $context['app'];
} else {
$app = 'no app in context';
}
$logClass=$this->logClass;
$logClass::write($app, $message, $level);
} }
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment