Update service.py

service.py

@@ -2,46 +2,59 @@ import http.server
 import socketserver
 import subprocess
 import threading
+import queue
 
 PORT = 8080
 command_executed = False
 command_output = []
+command_queue = queue.Queue()
 
-def run_command():
+def run_command(command):
     global command_output
+    process = subprocess.Popen(
+        command,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True
+    )
+    while True:
+        output = process.stdout.readline()
+        if output == '' and process.poll() is not None:
+            break
+        if output:
+            command_output.append(output)
+    stderr_output = process.stderr.read()
+    if stderr_output:
+        command_output.append(stderr_output)
+    process.stdout.close()
+    process.stderr.close()
+    process.wait()
+
+def command_worker():
+    while True:
+        command = command_queue.get()
+        if command is None:
+            break
+        run_command(command)
+        command_queue.task_done()
+
+def start_commands():
     commands = [
         ['./gradlew', 'jatsEval', '-Pp2t=/opt/grobid/evaluation/PMC_sample_1943', '-Prun=1', '-PfileRatio=1'],
         ['./gradlew', 'jatsEval', '-Pp2t=/opt/grobid/evaluation/PLOS_1000', '-Prun=1', '-PfileRatio=1'],
         ['./gradlew', 'jatsEval', '-Pp2t=/opt/grobid/evaluation/biorxiv-10k-test-2000', '-Prun=1', '-PfileRatio=1'],
         ['./gradlew', 'jatsEval', '-Pp2t=/opt/grobid/evaluation/eLife_984', '-Prun=1', '-PfileRatio=1']
     ]
-
     for command in commands:
-        process = subprocess.Popen(
-            command,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True
-        )
-        while True:
-            output = process.stdout.readline()
-            if output == '' and process.poll() is not None:
-                break
-            if output:
-                command_output.append(output)
-        stderr_output = process.stderr.read()
-        if stderr_output:
-            command_output.append(stderr_output)
-        process.stdout.close()
-        process.stderr.close()
-        process.wait()
+        command_queue.put(command)
+    threading.Thread(target=command_worker).start()
 
 class Handler(http.server.SimpleHTTPRequestHandler):
     def do_GET(self):
         global command_executed, command_output
         if not command_executed:
             command_executed = True
-            threading.Thread(target=run_command).start()
+            threading.Thread(target=start_commands).start()
             response = "Command is being executed."
         else:
             response = "Command output:\n" + "".join(command_output)
@@ -53,4 +66,4 @@ class Handler(http.server.SimpleHTTPRequestHandler):
 
 with socketserver.TCPServer(("", PORT), Handler) as httpd:
     print(f"Serving on port {PORT}")
-    httpd.serve_forever()
+    httpd.serve_forever()