Merge pull request #84 from seatable/opt-script-timeout-text

Opt script timeout text

Author: freeplant

scheduler/app/faas_scheduler/utils.py

@@ -27,7 +27,9 @@
 # defaults...
 LOG_DIR = "/opt/scheduler/logs/"
 SUB_PROCESS_TIMEOUT = int(os.environ.get("PYTHON_PROCESS_TIMEOUT", 60 * 15))
-TIMEOUT_OUTPUT = "Script running for too long time!"
+TIMEOUT_OUTPUT = (
+    "The script's running time exceeded the limit and the execution was aborted."
+)
 VERSION = os.getenv("VERSION")
 
 

scheduler/app/flask_server.py

@@ -33,7 +33,9 @@
 # defaults...
 SCRIPT_WORKERS = int(os.environ.get("PYTHON_SCHEDULER_SCRIPT_WORKERS", 5))
 SUB_PROCESS_TIMEOUT = int(os.environ.get("PYTHON_PROCESS_TIMEOUT", 60 * 15))
-TIMEOUT_OUTPUT = "Script running for too long time!"
+TIMEOUT_OUTPUT = (
+    "The script's running time exceeded the limit and the execution was aborted."
+)
 
 app = Flask(__name__)
 

starter/runner.py

@@ -370,7 +370,7 @@ def run_python(data):
         send_to_scheduler(
             False,
             -1,
-            "Script running for too long time!",
+            "The script's running time exceeded the limit and the execution was aborted.",
             DEFAULT_SUB_PROCESS_TIMEOUT,
             data,
         )