mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-05-14 07:04:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

make supervisord start orchestrator on startup

Browse source
This commit is contained in:
Nick Sweeting 2024-11-16 02:47:51 -08:00
parent ba26d75079
commit c2add7119c
No known key found for this signature in database
1 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

48
archivebox/queues/supervisor_util.py
View file

@ -42,6 +42,23 @@ COMMAND_WORKER = {
"stdout_logfile": "logs/worker_commands.log", "stdout_logfile": "logs/worker_commands.log",
"redirect_stderr": "true", "redirect_stderr": "true",
} }
ORCHESTRATOR_WORKER = {
"name": "worker_orchestrator",
"command": "archivebox manage orchestrator",
"autostart": "true",
"autorestart": "true",
"stdout_logfile": "logs/worker_orchestrator.log",
"redirect_stderr": "true",
}
SERVER_WORKER = lambda host, port: {
"name": "worker_daphne",
"command": f"daphne --bind={host} --port={port} --application-close-timeout=600 archivebox.core.asgi:application",
"autostart": "false",
"autorestart": "true",
"stdout_logfile": "logs/worker_daphne.log",
"redirect_stderr": "true",
}
@cache @cache
def get_sock_file(): def get_sock_file():
@ -378,18 +395,11 @@ def start_server_workers(host='0.0.0.0', port='8000', daemonize=False):
bg_workers = [ bg_workers = [
SCHEDULER_WORKER, SCHEDULER_WORKER,
COMMAND_WORKER, COMMAND_WORKER,
ORCHESTRATOR_WORKER,
] ]
fg_worker = {
"name": "worker_daphne",
"command": f"daphne --bind={host} --port={port} --application-close-timeout=600 archivebox.core.asgi:application",
"autostart": "false",
"autorestart": "true",
"stdout_logfile": "logs/worker_daphne.log",
"redirect_stderr": "true",
}
print() print()
start_worker(supervisor, fg_worker) start_worker(supervisor, SERVER_WORKER(host=host, port=port))
print() print()
for worker in bg_workers: for worker in bg_workers:
start_worker(supervisor, worker) start_worker(supervisor, worker)
@ -413,20 +423,12 @@ def start_server_workers(host='0.0.0.0', port='8000', daemonize=False):
def start_cli_workers(watch=False): def start_cli_workers(watch=False):
supervisor = get_or_create_supervisord_process(daemonize=False) supervisor = get_or_create_supervisord_process(daemonize=False)
fg_worker = { start_worker(supervisor, COMMAND_WORKER)
"name": "worker_system_tasks", start_worker(supervisor, ORCHESTRATOR_WORKER)
"command": "archivebox manage djangohuey --queue system_tasks",
"autostart": "true",
"autorestart": "true",
"stdout_logfile": "logs/worker_system_tasks.log",
"redirect_stderr": "true",
}
start_worker(supervisor, fg_worker)
if watch: if watch:
try: try:
watch_worker(supervisor, "worker_system_tasks") watch_worker(supervisor, ORCHESTRATOR_WORKER['name'])
except (KeyboardInterrupt, BrokenPipeError, IOError): except (KeyboardInterrupt, BrokenPipeError, IOError):
STDERR.print("\n[🛑] Got Ctrl+C, stopping gracefully...") STDERR.print("\n[🛑] Got Ctrl+C, stopping gracefully...")
except SystemExit: except SystemExit:
@ -435,10 +437,10 @@ def start_cli_workers(watch=False):
STDERR.print(f"\n[🛑] Got {e.__class__.__name__} exception, stopping web server gracefully...") STDERR.print(f"\n[🛑] Got {e.__class__.__name__} exception, stopping web server gracefully...")
raise raise
finally: finally:
stop_worker(supervisor, "worker_system_tasks") stop_worker(supervisor, COMMAND_WORKER['name'])
stop_worker(supervisor, "worker_scheduler") stop_worker(supervisor, ORCHESTRATOR_WORKER['name'])
time.sleep(0.5) time.sleep(0.5)
return fg_worker return [COMMAND_WORKER, ORCHESTRATOR_WORKER]
# def main(daemons): # def main(daemons):