Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion scheduler/app/faas_scheduler/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")


Expand Down
4 changes: 3 additions & 1 deletion scheduler/app/flask_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down
2 changes: 1 addition & 1 deletion starter/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down