Proper logging for appstore updates

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php
index 2e518f52e211a97970b8aea80bfa73c66b36d97d..abc37527d2a650c82b0c3cdd4150b372beadff92 100644 (file)
--- a/core/Command/Upgrade.php
+++ b/core/Command/Upgrade.php
@@ -220,8 +220,14 @@ class Upgrade extends Command {
                        $updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($output) {
                                $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) {
-                               $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) {
                                $output->writeln('<info>Checking updates of apps</info>');

diff --git a/core/ajax/update.php b/core/ajax/update.php
index 37abdc5dc3bbe590a9232ebd65bc86e91a99e27b..d23e3b0d56d43696d188da99f97fc9f7a03cccca 100644 (file)
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -160,6 +160,15 @@ if (OC::checkUpgrade(false)) {
        $updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) {
                $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) {
                $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]));
        });

diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index 023b3e6972cefa02cdddc9f312e1bcc820d41ad5..6f81e6175f3af31a132220b2dc85d996a95f6b10 100644 (file)
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -447,10 +447,12 @@ class Updater extends BasicEmitter {
                                        $this->log,
                                        \OC::$server->getConfig()
                                );
+                               $this->emit('\OC\Updater', 'checkAppStoreAppBefore', [$app]);
                                if (Installer::isUpdateAvailable($app, \OC::$server->getAppFetcher())) {
                                        $this->emit('\OC\Updater', 'upgradeAppStoreApp', [$app]);
                                        $installer->updateAppstoreApp($app);
                                }
+                               $this->emit('\OC\Updater', 'checkAppStoreApp', [$app]);
                        } catch (\Exception $ex) {
                                $this->log->logException($ex, ['app' => 'core']);
                        }
@@ -578,8 +580,14 @@ class Updater extends BasicEmitter {
                $this->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($log) {
                        $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) {
-                       $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) {
                        $log->info('\OC\Updater::appUpgradeCheckBefore: Checking updates of apps', ['app' => 'updater']);