Skip cli_set_process_title inside phpdbg

amphp · Jun 17, 2017 · 4546ef8 · 4546ef8
1 parent 39664d4
commit 4546ef8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/bin/worker b/bin/worker
@@ -4,7 +4,10 @@
 use Amp\Parallel\Sync;
 use Amp\Parallel\Worker;
 
-@cli_set_process_title('amp-worker');
+// Doesn't exist in phpdbg...
+if (\function_exists('cli_set_process_title')) {
+    @cli_set_process_title('amp-worker');
+}
 
 // Redirect all output written using echo, print, printf, etc. to STDERR.
 ob_start(function ($data) {
@@ -17,20 +20,20 @@ ob_start(function ($data) {
         dirname(__DIR__, 3) . '/autoload.php',
         dirname(__DIR__) . '/vendor/autoload.php',
     ];
-    
+
     $autoloadPath = null;
     foreach ($paths as $path) {
         if (file_exists($path)) {
             $autoloadPath = $path;
             break;
         }
     }
-    
+
     if ($autoloadPath === null) {
         fwrite(STDERR, 'Could not locate autoload.php.');
         exit(1);
     }
-    
+
     require $autoloadPath;
 })();
 

diff --git a/lib/Sync/ChannelParser.php b/lib/Sync/ChannelParser.php
@@ -46,10 +46,11 @@ public function encode($data): string {
      */
     private static function parser(callable $callback, callable $errorHandler): \Generator {
         while (true) {
-            $data = \unpack("Cprefix/Llength", yield self::HEADER_LENGTH);
+            $header = yield self::HEADER_LENGTH;
+            $data = \unpack("Cprefix/Llength", $header);
 
             if ($data["prefix"] !== 0) {
-                throw new ChannelException("Invalid header received");
+                throw new ChannelException("Invalid header received: " . \bin2hex($header));
             }
 
             $data = yield $data["length"];