Merge pull request #17093 from owncloud/upgrade-timestamp
[upgrade] show timestamp for output during upgrade
This commit is contained in:
commit
4e44cc49d9
|
@ -26,6 +26,7 @@
|
|||
|
||||
namespace OC\Core\Command;
|
||||
|
||||
use OC\Console\TimestampFormatter;
|
||||
use OC\Updater;
|
||||
use OCP\IConfig;
|
||||
use Symfony\Component\Console\Command\Command;
|
||||
|
@ -110,6 +111,12 @@ class Upgrade extends Command {
|
|||
}
|
||||
|
||||
if(\OC::checkUpgrade(false)) {
|
||||
if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
|
||||
// Prepend each line with a little timestamp
|
||||
$timestampFormatter = new TimestampFormatter($this->config, $output->getFormatter());
|
||||
$output->setFormatter($timestampFormatter);
|
||||
}
|
||||
|
||||
$self = $this;
|
||||
$updater = new Updater(\OC::$server->getHTTPHelper(),
|
||||
\OC::$server->getConfig());
|
||||
|
@ -130,9 +137,11 @@ class Upgrade extends Command {
|
|||
$updater->listen('\OC\Updater', 'updateEnd',
|
||||
function ($success) use($output, $updateStepEnabled, $self) {
|
||||
$mode = $updateStepEnabled ? 'Update' : 'Update simulation';
|
||||
$status = $success ? 'successful' : 'failed' ;
|
||||
$type = $success ? 'info' : 'error';
|
||||
$message = "<$type>$mode $status</$type>";
|
||||
if ($success) {
|
||||
$message = "<info>$mode successful</info>";
|
||||
} else {
|
||||
$message = "<error>$mode failed</error>";
|
||||
}
|
||||
$output->writeln($message);
|
||||
});
|
||||
$updater->listen('\OC\Updater', 'dbUpgrade', function () use($output) {
|
||||
|
|
|
@ -0,0 +1,107 @@
|
|||
<?php
|
||||
/**
|
||||
* @author Joas Schilling <nickvergessen@owncloud.com>
|
||||
*
|
||||
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Console;
|
||||
|
||||
|
||||
use OCP\IConfig;
|
||||
use Symfony\Component\Console\Formatter\OutputFormatterInterface;
|
||||
use Symfony\Component\Console\Formatter\OutputFormatterStyleInterface;
|
||||
|
||||
class TimestampFormatter implements OutputFormatterInterface {
|
||||
/** @var IConfig */
|
||||
protected $config;
|
||||
|
||||
/**
|
||||
* @param IConfig $config
|
||||
* @param OutputFormatterInterface $formatter
|
||||
*/
|
||||
public function __construct(IConfig $config, OutputFormatterInterface $formatter) {
|
||||
$this->config = $config;
|
||||
$this->formatter = $formatter;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the decorated flag.
|
||||
*
|
||||
* @param bool $decorated Whether to decorate the messages or not
|
||||
*/
|
||||
public function setDecorated($decorated) {
|
||||
$this->formatter->setDecorated($decorated);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the decorated flag.
|
||||
*
|
||||
* @return bool true if the output will decorate messages, false otherwise
|
||||
*/
|
||||
public function isDecorated() {
|
||||
return $this->formatter->isDecorated();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets a new style.
|
||||
*
|
||||
* @param string $name The style name
|
||||
* @param OutputFormatterStyleInterface $style The style instance
|
||||
*/
|
||||
public function setStyle($name, OutputFormatterStyleInterface $style) {
|
||||
$this->formatter->setStyle($name, $style);
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if output formatter has style with specified name.
|
||||
*
|
||||
* @param string $name
|
||||
* @return bool
|
||||
*/
|
||||
public function hasStyle($name) {
|
||||
$this->formatter->hasStyle($name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets style options from style with specified name.
|
||||
*
|
||||
* @param string $name
|
||||
* @return OutputFormatterStyleInterface
|
||||
*/
|
||||
public function getStyle($name) {
|
||||
return $this->formatter->getStyle($name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Formats a message according to the given styles.
|
||||
*
|
||||
* @param string $message The message to style
|
||||
* @return string The styled message, prepended with a timestamp using the
|
||||
* log timezone and dateformat, e.g. "2015-06-23T17:24:37+02:00"
|
||||
*/
|
||||
public function format($message) {
|
||||
|
||||
$timeZone = $this->config->getSystemValue('logtimezone', null);
|
||||
$timeZone = $timeZone !== null ? new \DateTimeZone($timeZone) : null;
|
||||
|
||||
$time = new \DateTime('now', $timeZone);
|
||||
$timestampInfo = $time->format($this->config->getSystemValue('logdateformat', 'c'));
|
||||
|
||||
return $timestampInfo . ' ' . $this->formatter->format($message);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue