mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4817 from nextcloud/more-app-update-logs 

Proper logging for appstore updates
This commit is contained in:
Lukas Reschke 2017-05-11 21:52:33 +02:00 committed by GitHub
parent 23b6f0e4d7 caa0ae94e8
commit d83f1d96d4
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/Command/Upgrade.php
View File

@ -220,8 +220,14 @@ class Upgrade extends Command {
$updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($output) { $updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($output) {
$output->writeln('<comment>Disabled 3rd-party app: ' . $app . '</comment>'); $output->writeln('<comment>Disabled 3rd-party app: ' . $app . '</comment>');
}); });
$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use($output) {
$output->writeln('<info>Checking for update of app ' . $app . ' in appstore</info>');
});
$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use($output) { $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use($output) {
$output->writeln('<info>Update 3rd-party app: ' . $app . '</info>'); $output->writeln('<info>Update app ' . $app . ' from appstore</info>');
});
$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use($output) {
$output->writeln('<info>Checked for update of app "' . $app . '" in appstore </info>');
}); });
$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($output) { $updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($output) {
$output->writeln('<info>Checking updates of apps</info>'); $output->writeln('<info>Checking updates of apps</info>');

9
core/ajax/update.php
View File

@ -160,6 +160,15 @@ if (OC::checkUpgrade(false)) {
$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) { $updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) {
$eventSource->send('success', (string)$l->t('Checking updates of apps')); $eventSource->send('success', (string)$l->t('Checking updates of apps'));
}); });
$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) {
$eventSource->send('success', (string)$l->t('Checking for update of app "%s" in appstore', [$app]));
});
$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) {
$eventSource->send('success', (string)$l->t('Update app "%s" from appstore', [$app]));
});
$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) {
$eventSource->send('success', (string)$l->t('Checked for update of app "%s" in appstore', [$app]));
});
$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) { $updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
$eventSource->send('success', (string)$l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app])); $eventSource->send('success', (string)$l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
}); });

10
lib/private/Updater.php
View File

@ -447,10 +447,12 @@ class Updater extends BasicEmitter {
$this->log, $this->log,
\OC::$server->getConfig() \OC::$server->getConfig()
); );
$this->emit('\OC\Updater', 'checkAppStoreAppBefore', [$app]);
if (Installer::isUpdateAvailable($app, \OC::$server->getAppFetcher())) { if (Installer::isUpdateAvailable($app, \OC::$server->getAppFetcher())) {
$this->emit('\OC\Updater', 'upgradeAppStoreApp', [$app]); $this->emit('\OC\Updater', 'upgradeAppStoreApp', [$app]);
$installer->updateAppstoreApp($app); $installer->updateAppstoreApp($app);
} }
$this->emit('\OC\Updater', 'checkAppStoreApp', [$app]);
} catch (\Exception $ex) { } catch (\Exception $ex) {
$this->log->logException($ex, ['app' => 'core']); $this->log->logException($ex, ['app' => 'core']);
} }
@ -578,8 +580,14 @@ class Updater extends BasicEmitter {
$this->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($log) { $this->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($log) {
$log->info('\OC\Updater::thirdPartyAppDisabled: Disabled 3rd-party app: ' . $app, ['app' => 'updater']); $log->info('\OC\Updater::thirdPartyAppDisabled: Disabled 3rd-party app: ' . $app, ['app' => 'updater']);
}); });
$this->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use($log) {
$log->info('\OC\Updater::checkAppStoreAppBefore: Checking for update of app "' . $app . '" in appstore', ['app' => 'updater']);
});
$this->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use($log) { $this->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use($log) {
$log->info('\OC\Updater::upgradeAppStoreApp: Update 3rd-party app: ' . $app, ['app' => 'updater']); $log->info('\OC\Updater::upgradeAppStoreApp: Update app "' . $app . '" from appstore', ['app' => 'updater']);
});
$this->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use($log) {
$log->info('\OC\Updater::checkAppStoreApp: Checked for update of app "' . $app . '" in appstore', ['app' => 'updater']);
}); });
$this->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($log) { $this->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($log) {
$log->info('\OC\Updater::appUpgradeCheckBefore: Checking updates of apps', ['app' => 'updater']); $log->info('\OC\Updater::appUpgradeCheckBefore: Checking updates of apps', ['app' => 'updater']);