Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Add try-catch for activation hook

Browse Source 
[MAILPOET-3656]
This commit is contained in:
Jan Lysý
2021-06-11 12:45:30 +02:00
committed by Veljko V
parent a382ba8635
commit a5b964c785
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Config/Initializer.php
View File

@@ -184,7 +184,13 @@ class Initializer {
} }
public function runActivator() { public function runActivator() {
return $this->activator->activate(); try {
$this->activator->activate();
} catch (InvalidStateException $e) {
return $this->handleRunningMigration($e);
} catch (\Exception $e) {
return $this->handleFailedInitialization($e);
}
} }
public function preInitialize() { public function preInitialize() {
@@ -246,7 +252,7 @@ class Initializer {
// if current db version and plugin version differ // if current db version and plugin version differ
if (version_compare($currentDbVersion, Env::$version) !== 0) { if (version_compare($currentDbVersion, Env::$version) !== 0) {
$this->runActivator(); $this->activator->activate();
} }
} }