[Pkg-owncloud-commits] [owncloud] 06/16: [upgrade] switch to debug logging on upgrade

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit f4c7b3051d6ebfdb1ef775e4cd0304f2e195dd12
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Sep 29 14:35:32 2015 +0200

    [upgrade] switch to debug logging on upgrade
    
    * resets afterwards
    * adds output about the previous log level
---
 core/ajax/update.php     |  6 ++++++
 core/command/upgrade.php |  6 ++++++
 lib/private/updater.php  | 16 ++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/core/ajax/update.php b/core/ajax/update.php
index 1e280a8..7a1b9a4 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -41,6 +41,12 @@ if (OC::checkUpgrade(false)) {
 		$eventSource->close();
 		OC_Config::setValue('maintenance', false);
 	});
+	$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Set log level to debug - current level: "%s"', array( $logLevelName )));
+	});
+	$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Reset log level to  "%s"', array( $logLevelName )));
+	});
 
 	$updater->upgrade();
 
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index af3a021..53b6717 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -113,6 +113,12 @@ class Upgrade extends Command {
 				$output->writeln("<error>$message</error>");
 				\OC_Config::setValue('maintenance', false);
 			});
+			$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($output) {
+				$output->writeln("<info>Set log level to debug - current level: '$logLevelName'</info>");
+			});
+			$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($output) {
+				$output->writeln("<info>Reset log level to '$logLevelName'</info>");
+			});
 
 			$success = $updater->upgrade();
 
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 64f8dc3..7c565e9 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -8,6 +8,7 @@
 
 namespace OC;
 
+use OC\Core\Command\Log\Manage;
 use OC\Hooks\BasicEmitter;
 
 /**
@@ -30,6 +31,14 @@ class Updater extends BasicEmitter {
 
 	private $updateStepEnabled;
 
+	private $logLevelNames = array(
+		0 => 'Debug',
+		1 => 'Info',
+		2 => 'Warning',
+		3 => 'Error',
+		4 => 'Fatal',
+	);
+
 	/**
 	 * @param \OC\Log $log
 	 */
@@ -126,6 +135,10 @@ class Updater extends BasicEmitter {
 	 * @return bool true if the operation succeeded, false otherwise
 	 */
 	public function upgrade() {
+		$logLevel = \OC_Config::getValue('loglevel', \OCP\Util::WARN);
+		$this->emit('\OC\Updater', 'setDebugLogLevel', array( $logLevel, $this->logLevelNames[$logLevel] ));
+		\OC_Config::setValue('loglevel', \OCP\Util::DEBUG);
+
 		\OC_DB::enableCaching(false);
 		\OC_Config::setValue('maintenance', true);
 
@@ -149,6 +162,9 @@ class Updater extends BasicEmitter {
 		$this->emit('\OC\Updater', 'maintenanceEnd');
 		$this->emit('\OC\Updater', 'updateEnd', array($success));
 
+		$this->emit('\OC\Updater', 'resetLogLevel', array( $logLevel, $this->logLevelNames[$logLevel] ));
+		\OC_Config::setValue('loglevel', $logLevel);
+
 		return $success;
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git