Merge pull request #8948 from owncloud/fix-logger-race-condition
set logger before registrate to an error handler
This commit is contained in:
commit
3239d1099c
1 changed files with 1 additions and 1 deletions
|
@ -515,13 +515,13 @@ class OC {
|
|||
}
|
||||
|
||||
if (!defined('PHPUNIT_RUN')) {
|
||||
OC\Log\ErrorHandler::setLogger(OC_Log::$object);
|
||||
if (defined('DEBUG') and DEBUG) {
|
||||
OC\Log\ErrorHandler::register(true);
|
||||
set_exception_handler(array('OC_Template', 'printExceptionErrorPage'));
|
||||
} else {
|
||||
OC\Log\ErrorHandler::register();
|
||||
}
|
||||
OC\Log\ErrorHandler::setLogger(OC_Log::$object);
|
||||
}
|
||||
|
||||
// register the stream wrappers
|
||||
|
|
Loading…
Reference in a new issue