sportarchive / CloudProcessingEngine-SDK

src/SA/CpeSdk/CpeActivity.php

Indentation +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
         // Check if there is an activity name
         if (!isset($params["name"]) || !$params["name"])
             throw new CpeSdk\CpeException("Can't instantiate BasicActivity: 'name' is not provided or empty !\n", 
-			    self::NO_ACTIVITY_NAME);
+                self::NO_ACTIVITY_NAME);
         
         if (!$cpeLogger)
             $this->cpeLogger = new CpeSdk\CpeLogger(null, $params["name"]); 
@@ -61,7 +61,7 @@ 
         // Check if there is a version name
         if (!isset($params["version"]) || !$params["version"])
             throw new CpeSdk\CpeException("Can't instantiate BasicActivity: 'version' is not provided or empty !\n", 
-			    self::NO_ACTIVITY_VERSION);
+                self::NO_ACTIVITY_VERSION);
 
         // Initialize the activity in SWF if necessary
         $this->init_activity();
@@ -106,12 +106,12 @@ 
     {
         if (!$task)
             throw new CpeSdk\CpeException("Activity Task empty !", 
-			    self::ACTIVITY_TASK_EMPTY); 
+                self::ACTIVITY_TASK_EMPTY); 
         
         if (!isset($task["input"]) || !$task["input"] ||
             $task["input"] == "")
             throw new CpeSdk\CpeException("No input provided to 'Activity'", 
-			    self::NO_INPUT);
+                self::NO_INPUT);
         
         // Save input string
         $this->input_str      = $task["input"];
@@ -135,7 +135,7 @@ 
         // Check JSON input
         if (!($this->input = json_decode($this->input_str)))
             throw new CpeSdk\CpeException("JSON input is invalid !", 
-			    self::INPUT_INVALID);
+                self::INPUT_INVALID);
     }
     
     /**

Spacing +16 added lines, -16 removed lines

@@ -11,20 +11,20 @@ 
 
 class CpeActivity
 {
-    public $params;          // Activity params coming from ActivityPoller
-    public $debug;           // Debug flag
+    public $params; // Activity params coming from ActivityPoller
+    public $debug; // Debug flag
     
-    public $activityId;      // ID of the activity
-    public $activityType;    // Type of activity
+    public $activityId; // ID of the activity
+    public $activityType; // Type of activity
     
-    public $cpeLogger;       // Logger
-    public $cpeSqsWriter;    // Used to write messages in SQS
-    public $cpeSwfHandler;   // USed to control SWF
-    public $cpeJsonValidator;// Run JSON schemas validation
+    public $cpeLogger; // Logger
+    public $cpeSqsWriter; // Used to write messages in SQS
+    public $cpeSwfHandler; // USed to control SWF
+    public $cpeJsonValidator; // Run JSON schemas validation
     
-    public $input_str;       // Complete activity input string
-    public $input;           // Complete activity input JSON object
-    public $activityLogKey;  // Create a key workflowId:activityId to put in logs
+    public $input_str; // Complete activity input string
+    public $input; // Complete activity input JSON object
+    public $activityLogKey; // Create a key workflowId:activityId to put in logs
     
     const HEARTBEAT_FAILED     = "HEARTBEAT_FAILED";
     const NO_ACTIVITY_NAME     = "NO_ACTIVITY_NAME";
@@ -44,7 +44,7 @@ 
         // For listening to the Input SQS queue 
         $this->cpeJsonValidator = new CpeSdk\CpeJsonValidator();     
         // Save activity params
-        $this->params        = $params;
+        $this->params = $params;
 
         // Check if there is an activity name
         if (!isset($params["name"]) || !$params["name"])
@@ -90,7 +90,7 @@ 
             return true;
         } catch (\Aws\Swf\Exception\UnknownResourceException $e) {
             $this->cpeLogger->log_out("ERROR", basename(__FILE__), 
-                "Activity '" . $this->params["name"] . "' doesn't exists. Creating it ...\n");
+                "Activity '".$this->params["name"]."' doesn't exists. Creating it ...\n");
         }
         
         // Register activites if doesn't exists in SWF
@@ -170,7 +170,7 @@ 
                 ));
         } catch (\Exception $e) {
             $this->cpeLogger->log_out("ERROR", basename(__FILE__), 
-                "Unable to send 'Task Failed' response ! " . $e->getMessage(),
+                "Unable to send 'Task Failed' response ! ".$e->getMessage(),
                 $this->activityLogKey);
             return false;
         }
@@ -195,7 +195,7 @@ 
                 ));
         } catch (\Exception $e) {
             $this->cpeLogger->log_out("ERROR", basename(__FILE__), 
-                "Unable to send 'Task Completed' response ! " . $e->getMessage(),
+                "Unable to send 'Task Completed' response ! ".$e->getMessage(),
                 $this->activityLogKey);
             return false;
         }
@@ -223,7 +223,7 @@ 
             if ($info->get("cancelRequested") == true)
             {
                 $this->cpeLogger->log_out("WARNING", basename(__FILE__), 
-                    "Cancel has been requested for this task '" . $task->get("activityId") . "' ! Killing task ...",
+                    "Cancel has been requested for this task '".$task->get("activityId")."' ! Killing task ...",
                     $this->activityLogKey);
                 throw new CpeSdk\CpeException("Cancel request. No heartbeat, leaving!",
                     self::HEARTBEAT_FAILED);

Braces +21 added lines, -15 removed lines

@@ -47,21 +47,24 @@ 
         $this->params        = $params;
 
         // Check if there is an activity name
-        if (!isset($params["name"]) || !$params["name"])
-            throw new CpeSdk\CpeException("Can't instantiate BasicActivity: 'name' is not provided or empty !\n", 
+        if (!isset($params["name"]) || !$params["name"]) {
+                    throw new CpeSdk\CpeException("Can't instantiate BasicActivity: 'name' is not provided or empty !\n", 
 			    self::NO_ACTIVITY_NAME);
+        }
         
-        if (!$cpeLogger)
-            $this->cpeLogger = new CpeSdk\CpeLogger(null, $params["name"], $debug); 
-        else
-            $this->cpeLogger = $cpeLogger;
+        if (!$cpeLogger) {
+                    $this->cpeLogger = new CpeSdk\CpeLogger(null, $params["name"], $debug);
+        } else {
+                    $this->cpeLogger = $cpeLogger;
+        }
         
         // Create logger object. Use activity name for logger
 
         // Check if there is a version name
-        if (!isset($params["version"]) || !$params["version"])
-            throw new CpeSdk\CpeException("Can't instantiate BasicActivity: 'version' is not provided or empty !\n", 
+        if (!isset($params["version"]) || !$params["version"]) {
+                    throw new CpeSdk\CpeException("Can't instantiate BasicActivity: 'version' is not provided or empty !\n", 
 			    self::NO_ACTIVITY_VERSION);
+        }
 
         // Initialize the activity in SWF if necessary
         $this->init_activity();
@@ -104,14 +107,16 @@ 
      */
     public function do_task_check($task)
     {
-        if (!$task)
-            throw new CpeSdk\CpeException("Activity Task empty !", 
-			    self::ACTIVITY_TASK_EMPTY); 
+        if (!$task) {
+                    throw new CpeSdk\CpeException("Activity Task empty !", 
+			    self::ACTIVITY_TASK_EMPTY);
+        }
         
         if (!isset($task["input"]) || !$task["input"] ||
-            $task["input"] == "")
-            throw new CpeSdk\CpeException("No input provided to 'Activity'", 
+            $task["input"] == "") {
+                    throw new CpeSdk\CpeException("No input provided to 'Activity'", 
 			    self::NO_INPUT);
+        }
         
         // Save input string
         $this->input_str      = $task["input"];
@@ -133,9 +138,10 @@ 
     public function do_input_validation()
     {
         // Check JSON input
-        if (!($this->input = json_decode($this->input_str)))
-            throw new CpeSdk\CpeException("JSON input is invalid !", 
+        if (!($this->input = json_decode($this->input_str))) {
+                    throw new CpeSdk\CpeException("JSON input is invalid !", 
 			    self::INPUT_INVALID);
+        }
     }
     
     /**

src/SA/CpeSdk/CpeException.php

Spacing +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
     
     // custom string representation of object
     public function __toString() {
-        return __CLASS__ . ": [{$this->ref}]: {$this->message}\n";
+        return __CLASS__.": [{$this->ref}]: {$this->message}\n";
     }
 }

src/SA/CpeSdk/CpeJsonValidator.php

Spacing +2 added lines, -2 removed lines

@@ -10,10 +10,10 @@
         $schemas_path)
     {
         $retriever    = new JsonSchema\Uri\UriRetriever;
-        $json_schemas = $retriever->retrieve('file://' . $schemas_path . "/$schemas_name");
+        $json_schemas = $retriever->retrieve('file://'.$schemas_path."/$schemas_name");
 
         $refResolver  = new JsonSchema\RefResolver($retriever);
-        $refResolver->resolve($json_schemas, 'file://' . $schemas_path . "/");
+        $refResolver->resolve($json_schemas, 'file://'.$schemas_path."/");
 
         $validator    = new JsonSchema\Validator();
         $validator->check($json, $json_schemas);

Braces +6 added lines, -4 removed lines

@@ -18,12 +18,14 @@
         $validator    = new JsonSchema\Validator();
         $validator->check($json, $json_schemas);
 
-        if ($validator->isValid())
-            return false;
+        if ($validator->isValid()) {
+                    return false;
+        }
     
         $details = "";
-        foreach ($validator->getErrors() as $error)
-            $details .= sprintf("[%s] %s\n", $error['property'], $error['message']);
+        foreach ($validator->getErrors() as $error) {
+                    $details .= sprintf("[%s] %s\n", $error['property'], $error['message']);
+        }
     
         return $details;
     }

src/SA/CpeSdk/CpeLogger.php

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
             $log["workflowId"] = $workflowId;
 
         // Open Syslog. Use programe name as key
-        if (!openlog (__FILE__, LOG_CONS|LOG_PID, LOG_LOCAL1))
+        if (!openlog(__FILE__, LOG_CONS|LOG_PID, LOG_LOCAL1))
             throw new CpeException("Unable to connect to Syslog!",
                 OPENLOG_ERROR);
         
@@ -96,11 +96,11 @@ 
         if (!is_string($log['message']))
             $log['message'] = json_encode($log['message']);
         
-        $toPrint = $log['time'] . " [" . $log['type'] . "] [" . $log['source'] . "] ";
+        $toPrint = $log['time']." [".$log['type']."] [".$log['source']."] ";
         // If there is a workflow ID. We append it.
         if ($workflowId)
             $toPrint .= "[$workflowId] ";
-        $toPrint .= $log['message'] . "\n";
+        $toPrint .= $log['message']."\n";
             
         if (file_put_contents(
                 $this->logPath,

Braces +27 added lines, -18 removed lines

@@ -28,15 +28,18 @@ 
         $this->printout = $printout;
         $this->logPath = "/var/tmp/logs/cpe/";
                 
-        if ($logPath)
-            $this->logPath = $logPath;
+        if ($logPath) {
+                    $this->logPath = $logPath;
+        }
 
-        if (!file_exists($this->logPath))
-            mkdir($this->logPath, 0755, true);
+        if (!file_exists($this->logPath)) {
+                    mkdir($this->logPath, 0755, true);
+        }
 
         $file = basename($argv[0]);
-        if ($suffix)
-            $file .= "-".$suffix;
+        if ($suffix) {
+                    $file .= "-".$suffix;
+        }
         // Append progname to the path
         $this->logPath .= "/".$file.".log";
 
@@ -60,13 +63,15 @@ 
             "message" => $message
         ];
     
-        if ($workflowId)
-            $log["workflowId"] = $workflowId;
+        if ($workflowId) {
+                    $log["workflowId"] = $workflowId;
+        }
 
         // Open Syslog. Use programe name as key
-        if (!openlog (__FILE__, LOG_CONS|LOG_PID, LOG_LOCAL1))
-            throw new CpeException("Unable to connect to Syslog!",
+        if (!openlog (__FILE__, LOG_CONS|LOG_PID, LOG_LOCAL1)) {
+                    throw new CpeException("Unable to connect to Syslog!",
                 OPENLOG_ERROR);
+        }
         
         // Change Syslog priority level
         switch ($type)
@@ -103,22 +108,26 @@ 
     // Write log in file
     private function print_to_file($log, $workflowId)
     {
-        if (!is_string($log['message']))
-            $log['message'] = json_encode($log['message']);
+        if (!is_string($log['message'])) {
+                    $log['message'] = json_encode($log['message']);
+        }
         
         $toPrint = $log['time'] . " [" . $log['type'] . "] [" . $log['source'] . "] ";
         // If there is a workflow ID. We append it.
-        if ($workflowId)
-            $toPrint .= "[$workflowId] ";
+        if ($workflowId) {
+                    $toPrint .= "[$workflowId] ";
+        }
         $toPrint .= $log['message'] . "\n";
 
-        if ($this->printout)
-            print $toPrint;
+        if ($this->printout) {
+                    print $toPrint;
+        }
         
         if (file_put_contents(
                 $this->logPath,
                 $toPrint,
-                FILE_APPEND) === false)
-            print "ERROR: Can't write into log file!\n";
+                FILE_APPEND) === false) {
+                    print "ERROR: Can't write into log file!\n";
+        }
     }
 }
\ No newline at end of file

src/SA/CpeSdk/Sqs/CpeSqsListener.php

Braces +11 added lines, -8 removed lines

@@ -31,10 +31,11 @@ 
         $this->sqs = $aws->get('Sqs');
 
         // Logger
-        if (!$cpeLogger)
-            $this->cpeLogger = new CpeSdk\CpeLogger();
-        else
-            $this->cpeLogger = $cpeLogger;
+        if (!$cpeLogger) {
+                    $this->cpeLogger = new CpeSdk\CpeLogger();
+        } else {
+                    $this->cpeLogger = $cpeLogger;
+        }
     }
     
     /**
@@ -45,12 +46,13 @@ 
     // Poll one message at a time from the provided SQS queue
     public function receive_message($queue, $timeout)
     {
-        if ($this->debug)
-            $this->cpeLogger->log_out(
+        if ($this->debug) {
+                    $this->cpeLogger->log_out(
                 "DEBUG", 
                 basename(__FILE__),
                 "Polling from '$queue' ..."
             );
+        }
             
         // Poll from SQS to check for new message 
         $result = $this->sqs->receiveMessage(array(
@@ -62,12 +64,13 @@ 
         if (($messages = $result->get('Messages')) &&
             count($messages))
         {
-            if ($this->debug)
-                $this->cpeLogger->log_out(
+            if ($this->debug) {
+                            $this->cpeLogger->log_out(
                     "DEBUG", 
                     basename(__FILE__),
                     "New messages recieved in queue: '$queue'"
                 );
+            }
             
             return $messages[0];
         }

src/SA/CpeSdk/Sqs/CpeSqsWriter.php

Braces +9 added lines, -6 removed lines

@@ -175,9 +175,10 @@ 
         $sendInput = null, 
         $result = null)
     {
-        if (!($input = json_decode($activityTask->get('input'))))
-            throw new CpeException("Task input JSON is invalid!\n".$activityTask->get('input'),
+        if (!($input = json_decode($activityTask->get('input')))) {
+                    throw new CpeException("Task input JSON is invalid!\n".$activityTask->get('input'),
                 INVALID_JSON);
+        }
         
         $activity = [
             'activityId'   => $activityTask->get('activityId'),
@@ -185,12 +186,14 @@ 
         ];
         
         // Want to send back the input data ?
-        if ($sendInput)
-            $activity['input'] = $input;
+        if ($sendInput) {
+                    $activity['input'] = $input;
+        }
         
         // Extra data? Concat to data array.
-        if ($result)
-            $activity['result'] = $result;
+        if ($result) {
+                    $activity['result'] = $result;
+        }
         
         // Initial data structure
         $data = array(

Doc Comments +9 added lines

@@ -98,6 +98,10 @@ 
         );
     }
 
+    /**
+     * @param string $reason
+     * @param string $details
+     */
     public function activity_failed($task, $reason, $details)
     {
         $this->send_activity_msg(
@@ -169,6 +173,11 @@ 
     }
 
     // Send a message to SQS output queue
+
+    /**
+     * @param string $eventType
+     * @param boolean $sendInput
+     */
     private function send_activity_msg(
         $activityTask, 
         $eventType, 

src/SA/CpeSdk/Swf/CpeSwfHandler.php

Braces +3 added lines, -2 removed lines

@@ -18,8 +18,9 @@
     public function __construct()
     {
         # Check if preper env vars are setup
-        if (!($region = getenv("AWS_DEFAULT_REGION")))
-            throw new CpeSdk\CpeException("Set 'AWS_DEFAULT_REGION' environment variable!");
+        if (!($region = getenv("AWS_DEFAULT_REGION"))) {
+                    throw new CpeSdk\CpeException("Set 'AWS_DEFAULT_REGION' environment variable!");
+        }
 
         // SWF client
         $this->swf = SwfClient::factory(array(