Merge branch 'error-handling-for-maintenance-mode' of https://github.…

…com/match/framework into match-error-handling-for-maintenance-mode
laravel · Jun 8, 2019 · f849544 · f849544
2 parents 7b7eaf9 + 6082be0
commit f849544
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/src/Illuminate/Foundation/Console/DownCommand.php b/src/Illuminate/Foundation/Console/DownCommand.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Foundation\Console;
 
+use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Support\InteractsWithTime;
 
@@ -32,12 +33,17 @@ class DownCommand extends Command
      */
     public function handle()
     {
-        file_put_contents(
-            storage_path('framework/down'),
-            json_encode($this->getDownFilePayload(), JSON_PRETTY_PRINT)
-        );
+        try {
+            file_put_contents(storage_path('framework/down'),
+                              json_encode($this->getDownFilePayload(),
+                              JSON_PRETTY_PRINT));
+            $this->comment('Application is now in maintenance mode.');
+        } catch (Exception $e) {
+            $this->error('Application is failed to enter maintenance mode.');
+            $this->error($e->getMessage());
 
-        $this->comment('Application is now in maintenance mode.');
+            return false;
+        }
     }
 
     /**

diff --git a/src/Illuminate/Foundation/Console/UpCommand.php b/src/Illuminate/Foundation/Console/UpCommand.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Foundation\Console;
 
+use Exception;
 use Illuminate\Console\Command;
 
 class UpCommand extends Command
@@ -27,8 +28,19 @@ class UpCommand extends Command
      */
     public function handle()
     {
-        @unlink(storage_path('framework/down'));
+        try {
+            if (! file_exists(storage_path('framework/down'))) {
+                $this->comment('Application is already up.');
 
-        $this->info('Application is now live.');
+                return true;
+            }
+            unlink(storage_path('framework/down'));
+            $this->info('Application is now live.');
+        } catch (Exception $e) {
+            $this->error('Application is failed to up.');
+            $this->error($e->getMessage());
+
+            return false;
+        }
     }
 }