From f20bb550220c3ecf534a5884218f6cee99f6e86a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Thu, 12 Nov 2020 21:41:09 +0100 Subject: [PATCH] Return false from CreateDatabase job --- src/Jobs/CreateDatabase.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Jobs/CreateDatabase.php b/src/Jobs/CreateDatabase.php index 51ce8c21..3a74534d 100644 --- a/src/Jobs/CreateDatabase.php +++ b/src/Jobs/CreateDatabase.php @@ -31,12 +31,15 @@ class CreateDatabase implements ShouldQueue { event(new CreatingDatabase($this->tenant)); - if ($this->tenant->getInternal('create_database') !== false) { - $databaseManager->ensureTenantCanBeCreated($this->tenant); - $this->tenant->database()->makeCredentials(); - $this->tenant->database()->manager()->createDatabase($this->tenant); - - event(new DatabaseCreated($this->tenant)); + // Terminate execution of this job & other jobs in the pipeline + if ($this->tenant->getInternal('create_database') === false) { + return false; } + + $databaseManager->ensureTenantCanBeCreated($this->tenant); + $this->tenant->database()->makeCredentials(); + $this->tenant->database()->manager()->createDatabase($this->tenant); + + event(new DatabaseCreated($this->tenant)); } }