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
2 changes: 1 addition & 1 deletion orchestrator/celery.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
app.conf.beat_schedule = {
"process_jobs": {
"task": "orchestrator.tasks.process_jobs",
"schedule": 60.0,
"schedule": settings.RIDGEBACK_CHECK_JOBS_INTERVAL,
"options": {"queue": settings.RIDGEBACK_SUBMIT_JOB_QUEUE},
},
"cleanup_completed_jobs": {
Expand Down
4 changes: 3 additions & 1 deletion orchestrator/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,9 @@ def check_job_status(job):
job.update_status(batch_system_status)

if batch_system_status in (Status.RUNNING,):
command_processor.delay(Command(CommandType.CHECK_HANGING, str(job.id)).to_dict())
# TODO: Fix performance and errors in CHECK_HANGING and CHECK_COMMAND_LINE_STATUS commands
pass
# command_processor.delay(Command(CommandType.CHECK_HANGING, str(job.id)).to_dict())
# command_processor.delay(Command(CommandType.CHECK_COMMAND_LINE_STATUS, str(job.id)).to_dict())

elif batch_system_status in (Status.COMPLETED,):
Expand Down
2 changes: 1 addition & 1 deletion ridgeback/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.1.4"
__version__ = "2.1.5"
11 changes: 9 additions & 2 deletions ridgeback/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@
RIDGEBACK_CLEANUP_QUEUE = os.environ.get("RIDGEBACK_CLEANUP_QUEUE", "ridgeback_cleanup_queue")
RIDGEBACK_COMMAND_QUEUE = os.environ.get("RIDGEBACK_COMMAND_QUEUE", "ridgeback_command_queue")
RIDGEBACK_SET_PERMISSIONS_QUEUE = os.environ.get("RIDGEBACK_SET_PERMISSIONS_QUEUE", "ridgeback_set_permissions")
RIDGEBACK_CHECK_JOBS_INTERVAL = int(os.environ.get("RIDGEBACK_CHECK_JOBS_INTERVAL", 180))

CELERY_ACCEPT_CONTENT = ["json"]
CELERY_TASK_SERIALIZER = "json"
Expand All @@ -213,6 +214,12 @@

LOG_PATH = os.environ.get("RIDGEBACK_LOG_PATH", "ridgeback-server.log")

if ENVIRONMENT == "prod":
handlers = ["file"]
else:
handlers = ["file", "console"]


LOGGING = {
"version": 1,
"disable_existing_loggers": False,
Expand All @@ -227,9 +234,9 @@
},
},
"loggers": {
"django_auth_ldap": {"level": "DEBUG", "handlers": ["console"]},
"django_auth_ldap": {"level": "DEBUG", "handlers": handlers},
"django": {
"handlers": ["file", "console"],
"handlers": handlers,
"level": "INFO",
"propagate": True,
},
Expand Down
Loading