From 3388758d046584d1425897a9b3d311c2e88b65e4 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 25 Mar 2021 09:01:09 +0100 Subject: [PATCH] Remove event listener to udpate events that are not present anymore Signed-off-by: Morris Jobke --- core/Command/Upgrade.php | 12 ------------ core/ajax/update.php | 12 ------------ lib/private/Updater.php | 12 ------------ 3 files changed, 36 deletions(-) diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php index 7ab5fe8e5f..9dc1c4642b 100644 --- a/core/Command/Upgrade.php +++ b/core/Command/Upgrade.php @@ -203,12 +203,6 @@ class Upgrade extends Command { $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($output) { $output->writeln('Updated database'); }); - $updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use ($output) { - $output->writeln('Checking whether the database schema can be updated (this can take a long time depending on the database size)'); - }); - $updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($output) { - $output->writeln('Checked database schema update'); - }); $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use ($output) { $output->writeln('Disabled incompatible app: ' . $app . ''); }); @@ -221,15 +215,9 @@ class Upgrade extends Command { $updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($output) { $output->writeln('Checked for update of app "' . $app . '" in appstore '); }); - $updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($output) { - $output->writeln('Checking updates of apps'); - }); $updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($output) { $output->writeln("Checking whether the database schema for <$app> can be updated (this can take a long time depending on the database size)"); }); - $updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($output) { - $output->writeln('Checked database schema update for apps'); - }); $updater->listen('\OC\Updater', 'appUpgradeStarted', function ($app, $version) use ($output) { $output->writeln("Updating <$app> ..."); }); diff --git a/core/ajax/update.php b/core/ajax/update.php index 09931ec91e..6e655f4284 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -162,15 +162,6 @@ if (\OCP\Util::needUpgrade()) { $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) { $eventSource->send('success', $l->t('Updated database')); }); - $updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use ($eventSource, $l) { - $eventSource->send('success', $l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)')); - }); - $updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) { - $eventSource->send('success', $l->t('Checked database schema update')); - }); - $updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) { - $eventSource->send('success', $l->t('Checking updates of apps')); - }); $updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) { $eventSource->send('success', $l->t('Checking for update of app "%s" in appstore', [$app])); }); @@ -183,9 +174,6 @@ if (\OCP\Util::needUpgrade()) { $updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) { $eventSource->send('success', $l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app])); }); - $updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($eventSource, $l) { - $eventSource->send('success', $l->t('Checked database schema update for apps')); - }); $updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) { $eventSource->send('success', $l->t('Updated "%1$s" to %2$s', [$app, $version])); }); diff --git a/lib/private/Updater.php b/lib/private/Updater.php index f6ba27991e..78c652b6ee 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -538,12 +538,6 @@ class Updater extends BasicEmitter { $this->listen('\OC\Updater', 'dbUpgrade', function () use ($log) { $log->info('\OC\Updater::dbUpgrade: Updated database', ['app' => 'updater']); }); - $this->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use ($log) { - $log->info('\OC\Updater::dbSimulateUpgradeBefore: Checking whether the database schema can be updated (this can take a long time depending on the database size)', ['app' => 'updater']); - }); - $this->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($log) { - $log->info('\OC\Updater::dbSimulateUpgrade: Checked database schema update', ['app' => 'updater']); - }); $this->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use ($log) { $log->info('\OC\Updater::incompatibleAppDisabled: Disabled incompatible app: ' . $app, ['app' => 'updater']); }); @@ -556,15 +550,9 @@ class Updater extends BasicEmitter { $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']); - }); $this->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($log) { $log->info('\OC\Updater::appSimulateUpdate: Checking whether the database schema for <' . $app . '> can be updated (this can take a long time depending on the database size)', ['app' => 'updater']); }); - $this->listen('\OC\Updater', 'appUpgradeCheck', function () use ($log) { - $log->info('\OC\Updater::appUpgradeCheck: Checked database schema update for apps', ['app' => 'updater']); - }); $this->listen('\OC\Updater', 'appUpgradeStarted', function ($app) use ($log) { $log->info('\OC\Updater::appUpgradeStarted: Updating <' . $app . '> ...', ['app' => 'updater']); });