added check for EPROCESS_AUTOLOAD, fixed formatting

421p · 421p · commit fe5855e67a19 · 2016-04-04T13:00:04.000Z
diff --git a/EProcess/Adapter/BaseAdapter.php b/EProcess/Adapter/BaseAdapter.php
@@ -17,18 +17,22 @@ public function __construct(LoopInterface $loop)
 
     protected function createUnixSocket()
     {
-        if(!defined('SOCKET_PATH'))
-            throw new \Exception("SOCKET_PATH is not defined.");
-        
-        if(!is_writable(SOCKET_PATH)){
-            if(!mkdir(SOCKET_PATH))
-                throw new \Exception("Cannot create folder at SOCKET_PATH.");
+        if (!defined('EPROCESS_SOCKET_DIR')) {
+            throw new \Exception("EPROCESS_SOCKET_DIR is not defined.");
         }
 
-        $unixFile = sprintf('%s/%s.sock', SOCKET_PATH, $this->node);
+        if (!defined('EPROCESS_AUTOLOAD')) {
+            throw new \Exception('EPROCESS_AUTOLOAD is not defined.');
+        }
+
+        if (!is_writable(EPROCESS_SOCKET_DIR)) {
+            throw new \Exception(sprintf("Cannot write to %s.", EPROCESS_SOCKET_DIR));
+        }
+
+        $unixFile = sprintf('%s/%s.sock', EPROCESS_SOCKET_DIR, $this->node);
         $unix = sprintf('unix://%s', $unixFile);
 
-        $cleanup = function() use ($unixFile) {
+        $cleanup = function () use ($unixFile) {
             $this->loop->stop();
             @unlink($unixFile);
         };
@@ -40,5 +44,6 @@ protected function createUnixSocket()
     }
 
     abstract public function create($class, array $data = []);
+
     abstract public function kill();
 }
diff --git a/examples/autoload.php b/examples/autoload.php
@@ -3,6 +3,7 @@
 declare(ticks = 1);
 
 define('EPROCESS_AUTOLOAD', __FILE__);
+define('EPROCESS_SOCKET_DIR', '/tmp/eprocess');
 
 $loader = require __DIR__ . '/../vendor/autoload.php';
 
diff --git a/examples/simple.php b/examples/simple.php
@@ -1,7 +1,5 @@
 <?php
 
-define('SOCKET_PATH', '/tmp/eprocess');
-
 require_once __DIR__ . '/autoload.php';
 
 use Doctrine\Common\Annotations\AnnotationRegistry;
