Fix: Make sure that missing supervisors are correctly displayed when using multiple environments

src/Console/HorizonCommand.php

@@ -35,13 +35,13 @@ public function handle(MasterSupervisorRepository $masters)
             return $this->comment('A master supervisor is already running on this machine.');
         }
 
-        $master = (new MasterSupervisor)->handleOutputUsing(function ($type, $line) {
+        $environment = $this->option('environment') ?? config('horizon.env') ?? config('app.env');
+
+        $master = (new MasterSupervisor($environment))->handleOutputUsing(function ($type, $line) {
             $this->output->write($line);
         });
 
-        ProvisioningPlan::get(MasterSupervisor::name())->deploy(
-            $this->option('environment') ?? config('horizon.env') ?? config('app.env')
-        );
+        ProvisioningPlan::get(MasterSupervisor::name())->deploy($environment);
 
         $this->info('Horizon started successfully.');
 

src/Http/Controllers/MasterSupervisorController.php

@@ -25,7 +25,7 @@ public function index(MasterSupervisorRepository $masters,
         return $masters->each(function ($master, $name) use ($supervisors) {
             $master->supervisors = ($supervisors->get($name) ?? collect())
                 ->merge(
-                    collect(ProvisioningPlan::get($name)->plan[config('horizon.env') ?? config('app.env')] ?? [])
+                    collect(ProvisioningPlan::get($name)->plan[$master->environment ?? config('horizon.env') ?? config('app.env')] ?? [])
                         ->map(function ($value, $key) use ($name) {
                             return (object) [
                                 'name' => $name.':'.$key,

src/MasterSupervisor.php

@@ -21,6 +21,13 @@ class MasterSupervisor implements Pausable, Restartable, Terminable
 {
     use ListensForSignals;
 
+    /**
+     * The environment that was used to provision this master supervisor.
+     *
+     * @var string|null
+     */
+    public $environment;
+
     /**
      * The name of the master supervisor.
      *
@@ -59,10 +66,13 @@ class MasterSupervisor implements Pausable, Restartable, Terminable
     /**
      * Create a new master supervisor instance.
      *
+     * @param  string  $environment
      * @return void
      */
-    public function __construct()
+    public function __construct(string $environment = null)
     {
+        $this->environment = $environment;
+
         $this->name = static::name();
         $this->supervisors = collect();
 

src/Repositories/RedisMasterSupervisorRepository.php

@@ -72,7 +72,7 @@ public function get(array $names)
     {
         $records = $this->connection()->pipeline(function ($pipe) use ($names) {
             foreach ($names as $name) {
-                $pipe->hmget('master:'.$name, ['name', 'pid', 'status', 'supervisors']);
+                $pipe->hmget('master:'.$name, ['name', 'environment', 'pid', 'status', 'supervisors']);
             }
         });
 
@@ -81,9 +81,10 @@ public function get(array $names)
 
             return ! $record[0] ? null : (object) [
                 'name' => $record[0],
-                'pid' => $record[1],
-                'status' => $record[2],
-                'supervisors' => json_decode($record[3], true),
+                'environment' => $record[1],
+                'pid' => $record[2],
+                'status' => $record[3],
+                'supervisors' => json_decode($record[4], true),
             ];
         })->filter()->all();
     }
@@ -102,6 +103,7 @@ public function update(MasterSupervisor $master)
             $pipe->hmset(
                 'master:'.$master->name, [
                     'name' => $master->name,
+                    'environment' => $master->environment,
                     'pid' => $master->pid(),
                     'status' => $master->working ? 'running' : 'paused',
                     'supervisors' => json_encode($supervisors),