Merge pull request #8948 from owncloud/fix-logger-race-condition

set logger before registrate to an error handler
This commit is contained in:
Morris Jobke 2014-06-09 11:07:10 +02:00
commit 3239d1099c

View file

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