fix: use system timeout command with timeout helper

doubtfire-lms · Aug 20, 2024 · b77147c · b77147c
1 parent 38abe9e
commit b77147c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 92 deletions.
diff --git a/app/helpers/timeout_helper.rb b/app/helpers/timeout_helper.rb
@@ -25,12 +25,10 @@ def try_within(sec, timeout_message = 'operation')
   #
   def system_try_within(sec, timeout_message, command)
     # shell script to kill command after timeout
-    timeout_exec = Rails.root.join('lib/shell/timeout.sh')
-    result = false
-    try_within sec, timeout_message do
-      result = system "#{timeout_exec} -t #{sec} nice -n 10 #{command}"
-    end
-    result
+    system "timeout -k 2 #{sec} nice -n 10 #{command}"
+  rescue
+    logger.error "Timeout when #{timeout_message} after #{sec}s"
+    false
   end
 
   # Export functions as module functions

diff --git a/lib/shell/timeout.sh b/lib/shell/timeout.sh