Merge pull request #72 from bfansports/feature/memory-leak-fixes

Fix memory leaks

Author: mhugot

src/activities/TranscodeAssetActivity.php

@@ -181,32 +181,36 @@ private function uploadResultFiles($task, $output)
                                           self::TMP_PATH_OPEN_FAIL);
         }
 
-        // Upload all resulting files sitting in $outputFilesPath to S3
-        while ($entry = readdir($handle)) {
-            if ($entry == "." || $entry == "..") {
-                continue;
-            }
+        try {
+            // Upload all resulting files sitting in $outputFilesPath to S3
+            while ($entry = readdir($handle)) {
+                if ($entry == "." || $entry == "..") {
+                    continue;
+                }
+
+                // Destination path on S3. Sanitizing
+                $s3Location = $output->{'output_file_info'}['dirname']."/$entry";
+                $s3Location = str_replace("//", "/", $s3Location);
+
+                // Send to S3. We reference the callback s3_put_processing_callback
+                // The callback ping back SWF so we stay alive
+                $s3Output = $this->s3Utils->put_file_into_s3(
+                    $s3Bucket,
+                    $s3Location,
+                    "$this->outputFilesPath/$entry",
+                    $options,
+                    array($this, "activityHeartbeat"),
+                    null
+                );
+                // We delete the TMP file once uploaded
+                unlink("$this->outputFilesPath/$entry");
 
-            // Destination path on S3. Sanitizing
-            $s3Location = $output->{'output_file_info'}['dirname']."/$entry";
-            $s3Location = str_replace("//", "/", $s3Location);
-
-            // Send to S3. We reference the callback s3_put_processing_callback
-            // The callback ping back SWF so we stay alive
-            $s3Output = $this->s3Utils->put_file_into_s3(
-                $s3Bucket,
-                $s3Location,
-                "$this->outputFilesPath/$entry",
-                $options,
-                array($this, "activityHeartbeat"),
-                null
-            );
-            // We delete the TMP file once uploaded
-            unlink("$this->outputFilesPath/$entry");
-
-            $this->cpeLogger->logOut("INFO", basename(__FILE__),
-                                     $s3Output['msg'],
-                                     $this->logKey);
+                $this->cpeLogger->logOut("INFO", basename(__FILE__),
+                                         $s3Output['msg'],
+                                         $this->logKey);
+            }
+        } finally {
+            closedir($handle);
         }
     }
 

src/activities/ValidateAssetActivity.php

@@ -91,20 +91,23 @@ public function process($task)
             $this->curl_data = '';
 
             $ch = curl_init();
-            curl_setopt($ch, CURLOPT_URL, $this->input->{'input_asset'}->{'http'});
-            curl_setopt($ch, CURLOPT_RANGE, '0-1024');
-            curl_setopt($ch, CURLOPT_WRITEFUNCTION, array($this, 'writefn'));
-            curl_exec($ch);
-            if ($errno = curl_errno($ch)) {
-                if ($errno != CURLE_WRITE_ERROR) {
-                    $error_message = curl_strerror($errno);
-                    throw new CpeSdk\CpeException(
-                        $error_message,
-                        self::VALIDATE_ASSET_FAILED
-                    );
+            try {
+                curl_setopt($ch, CURLOPT_URL, $this->input->{'input_asset'}->{'http'});
+                curl_setopt($ch, CURLOPT_RANGE, '0-1024');
+                curl_setopt($ch, CURLOPT_WRITEFUNCTION, array($this, 'writefn'));
+                curl_exec($ch);
+                if ($errno = curl_errno($ch)) {
+                    if ($errno != CURLE_WRITE_ERROR) {
+                        $error_message = curl_strerror($errno);
+                        throw new CpeSdk\CpeException(
+                            $error_message,
+                            self::VALIDATE_ASSET_FAILED
+                        );
+                    }
                 }
+            } finally {
+                curl_close($ch);
             }
-            curl_close($ch);
 
             $chunk = $this->curl_data;
         }

src/scripts/putInS3.php

@@ -47,7 +47,7 @@ function check_input_parameters(&$options)
 try {
     # Check if preper env vars are setup
     if (!($region = getenv("AWS_DEFAULT_REGION")))
-        throw new CpeSdk\CpeException("Set 'AWS_DEFAULT_REGION' environment variable!");
+        throw new \SA\CpeSdk\CpeException("Set 'AWS_DEFAULT_REGION' environment variable!");
 
     // Get S3 client
     $s3 = new \Aws\S3\S3Client([