Stop command fix

CupOfTea696 · Jun 4, 2015 · ecb15a9 · ecb15a9
1 parent 07a53d5
commit ecb15a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Server/Dispatcher.php b/src/Server/Dispatcher.php
@@ -128,18 +128,21 @@ public function push($message){
         $data = $message['data'];
         $recipient = array_get($message, 'recipient');
 
-        if (!$topic)
-            return;
-
         // Handle TwoStream::stop();
-        if ($topic = 'cupoftea/twostream/server/stop') {
+        if ($message['topic'] == 'cupoftea/twostream/server/stop') {
+            $this->output->writeln("Stop Command fired.");
+            $this->output->writeln("<question>Stopping Server.</question>");
+
             if ($data['secret'] == config('app.key')) {
                 die();
             } else {
                 // report malicious attempt
             }
         }
 
+        if (!$topic)
+            return;
+
         if ($recipient == 'all') {
             $topic->broadcast($data);
         } else {

diff --git a/src/TwoStream.php b/src/TwoStream.php
@@ -94,7 +94,7 @@ public function stop()
                 'data' => [
                     'secret' => config('app.key')
                 ],
-                'recipient' => $recipient,
+                'recipient' => 'server',
             ])
         );
     }