Merge branch 'release/1.2.14' into v1

Author: Andrew Welch

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Transcoder Changelog
 
+## 1.2.14 - 2021.01.03
+### Changed
+* Changed how we detect whether the transcoding processing is running, so it will work with Alpine Linux
+
 ## 1.2.13 - 2020.12.21 [CRITICAL]
 ### Security
 * Added a `$enableDownloadFileEndpoint` settings/config option (set to `false` by default) to control whether the download files action is publicly accessible

composer.json

@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-transcoder",
     "description": "Transcode video & audio files to various formats, and provide video thumbnails",
     "type": "craft-plugin",
-    "version": "1.2.13",
+    "version": "1.2.14",
     "keywords": [
         "craft",
         "cms",

src/services/Transcode.php

@@ -188,8 +188,10 @@ public function getVideoUrl($filePath, $videoOptions, $generate = true): string
             $lockFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.$destVideoFile.'.lock';
             $oldPid = @file_get_contents($lockFile);
             if ($oldPid !== false) {
-                exec("ps $oldPid", $ProcessState);
-                if (\count($ProcessState) >= 2) {
+                // See if the process is running, and empty result means the process is still running
+                // ref: https://stackoverflow.com/questions/3043978/how-to-check-if-a-process-id-pid-exists
+                exec("kill -0 $oldPid 2>&1", $ProcessState);
+                if (\count($ProcessState) === 0) {
                     return $result;
                 }
                 // It's finished transcoding, so delete the lockfile and progress file
@@ -414,8 +416,10 @@ public function getAudioUrl($filePath, $audioOptions): string
                 $lockFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.$destAudioFile.'.lock';
                 $oldPid = @file_get_contents($lockFile);
                 if ($oldPid !== false) {
-                    exec("ps $oldPid", $ProcessState);
-                    if (\count($ProcessState) >= 2) {
+                    // See if the process is running, and empty result means the process is still running
+                    // ref: https://stackoverflow.com/questions/3043978/how-to-check-if-a-process-id-pid-exists
+                    exec("kill -0 $oldPid 2>&1", $ProcessState);
+                    if (\count($ProcessState) === 0) {
                         return $result;
                     }
                     // It's finished transcoding, so delete the lockfile and progress file
@@ -675,8 +679,10 @@ public function getGifUrl($filePath, $gifOptions): string
             $lockFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.$destVideoFile.'.lock';
             $oldPid = @file_get_contents($lockFile);
             if ($oldPid !== false) {
-                exec("ps $oldPid", $ProcessState);
-                if (\count($ProcessState) >= 2) {
+                // See if the process is running, and empty result means the process is still running
+                // ref: https://stackoverflow.com/questions/3043978/how-to-check-if-a-process-id-pid-exists
+                exec("kill -0 $oldPid 2>&1", $ProcessState);
+                if (\count($ProcessState) === 0) {
                     return $result;
                 }
                 // It's finished transcoding, so delete the lockfile and progress file