diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-04-26 11:53:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-26 11:53:21 +0200 |
| commit | b7e8ab97e731b77ef2ec519bfb98019516b7f682 (patch) | |
| tree | d579e7442832672ab2987f9c9ecf62e79ca09a8d /core | |
| parent | 12c5db90322f61d4d48e1bb534bb94382d17e317 (diff) | |
| parent | 38a90130ce425d531a804dff591df4a883de3154 (diff) | |
| download | nextcloud-server-b7e8ab97e731b77ef2ec519bfb98019516b7f682.tar.gz nextcloud-server-b7e8ab97e731b77ef2ec519bfb98019516b7f682.zip | |
Merge pull request #9308 from nextcloud/proper-ocp-constants
Move log constants to ILogger
Diffstat (limited to 'core')
| -rw-r--r-- | core/Controller/SetupController.php | 3 | ||||
| -rw-r--r-- | core/ajax/update.php | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php index f79e9efe0c2..17d7b51d3fe 100644 --- a/core/Controller/SetupController.php +++ b/core/Controller/SetupController.php @@ -30,6 +30,7 @@ namespace OC\Core\Controller; use OC\Setup; +use OCP\ILogger; class SetupController { /** @var Setup */ @@ -107,7 +108,7 @@ class SetupController { public function loadAutoConfig($post) { if( file_exists($this->autoConfigFile)) { - \OCP\Util::writeLog('core', 'Autoconfig file found, setting up ownCloud…', \OCP\Util::INFO); + \OCP\Util::writeLog('core', 'Autoconfig file found, setting up ownCloud…', ILogger::INFO); $AUTOCONFIG = array(); include $this->autoConfigFile; $post = array_merge ($post, $AUTOCONFIG); diff --git a/core/ajax/update.php b/core/ajax/update.php index 22be2a4f60e..6ec6b71731d 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -28,6 +28,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + +use OCP\ILogger; use Symfony\Component\EventDispatcher\GenericEvent; if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) { @@ -208,7 +210,7 @@ if (\OCP\Util::needUpgrade()) { $updater->upgrade(); } catch (\Exception $e) { \OC::$server->getLogger()->logException($e, [ - 'level' => \OCP\Util::ERROR, + 'level' => ILogger::ERROR, 'app' => 'update', ]); $eventSource->send('failure', get_class($e) . ': ' . $e->getMessage()); |