Tweaks

Author: tony-martin-aste

src/Crusse/JobServer/EventLoop.php

@@ -205,17 +205,8 @@ private function getMessagesFromStream( $stream ) {
 
     // Populate the MessageBuffer from the stream
 
-    if ( $this->blocking ) {
-      do {
-        $data = stream_socket_recvfrom( $stream, 1500 );
-        $this->populateMessageBuffer( $data, $buffer );
-      }
-      while ( !$buffer->hasMessage );
-    }
-    else {
-      $data = stream_socket_recvfrom( $stream, 1500 );
-      $this->populateMessageBuffer( $data, $buffer );
-    }
+    $data = stream_socket_recvfrom( $stream, 1500 );
+    $this->populateMessageBuffer( $data, $buffer );
 
     // Get finished Message objects from the MessageBuffer
 

src/Crusse/JobServer/Server.php

@@ -223,7 +223,7 @@ function getResults() {
       if ( !$this->workerProcs )
         $this->createWorkerProcs( $this->workerCount );
 
-      $loop = new EventLoop( false );
+      $loop = new EventLoop( true );
       $loop->addServerStream( $this->serverStream );
       $loop->subscribe( array( $this, '_messageCallback' ) );
       $loop->run();

src/Crusse/JobServer/Worker.php

@@ -27,7 +27,7 @@ function run() {
     if ( !$stream || $errNum != 0 )
       throw new \Exception( 'Could not create socket client: ('. $errNum .') '. $errStr );
 
-    $loop = new EventLoop( false );
+    $loop = new EventLoop( true );
     $loop->subscribe( array( $this, '_messageCallback' ) );
     $loop->addClientStream( $stream );
     $this->sendMessage( $loop, $stream, 'new-worker' );