diff options
| -rw-r--r-- | python/task_runner.py | 12 | ||||
| -rw-r--r-- | scripts/task-runner.service | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/python/task_runner.py b/python/task_runner.py index 1e5738b7..67f68edc 100644 --- a/python/task_runner.py +++ b/python/task_runner.py @@ -1,23 +1,15 @@ import logging -import os import redis -import socket import tasks from systemd.daemon import notify from systemd import journal from json import loads, dumps from db import dbconn -from termcolor import colored +from process_queue import get_redis_queue def run(): - hostname = socket.gethostname() ET = dbconn('etdb') - if hostname == 'ziggy': - q = redis.Redis(unix_socket_path='/run/redis/redis.sock') - os.environ['OMP_NUM_THREADS'] = '8' - else: - q = redis.Redis(host='ziggy') - os.environ['OMP_NUM_THREADS'] = '4' + q = get_redis_queue() notify("READY=1") while True: f, args = loads(q.blpop("tasks")[1].decode('utf-8')) diff --git a/scripts/task-runner.service b/scripts/task-runner.service index 606ff577..5aee0601 100644 --- a/scripts/task-runner.service +++ b/scripts/task-runner.service @@ -9,6 +9,7 @@ WorkingDirectory=/home/guillaume/projects/code/python Environment=DATA_DIR=/home/serenitas/CorpCDOs/data Environment=LOG_DIR=/home/serenitas/CorpCDOs/logs Environment=CODE_DIR=/home/guillaume/projects/code +Environment=OMP_NUM_THREADS=4 Environment='R_LIBS_USER=/home/guillaume/R/\x25p-library/\x25v' Environment=PGPASSFILE=/home/guillaume/.pgpass Restart=always |