aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--python/task_runner.py4
-rw-r--r--scripts/task-runner.service2
2 files changed, 4 insertions, 2 deletions
diff --git a/python/task_runner.py b/python/task_runner.py
index 44d152b3..5fcf8070 100644
--- a/python/task_runner.py
+++ b/python/task_runner.py
@@ -1,10 +1,10 @@
import logging
-import tasks
from systemd.daemon import notify
from systemd import journal
from db import dbconn
from common import get_redis_queue
+from tasks import Rpc
def run():
ET = dbconn('etdb')
@@ -13,7 +13,7 @@ def run():
while True:
rpc = Rpc.from_json(q.blpop("tasks")[1].decode('utf-8'))
- journal.send("Running '{}'".format(rpc.fun), ARGS=dumps(rpc.args))
+ journal.send("Running '{}'".format(rpc.fun), ARGS=rpc.args)
if rpc.fun == 'generate_scenarios':
rpc.args += [ET]
rpc()
diff --git a/scripts/task-runner.service b/scripts/task-runner.service
index 0266a558..8bc3a2a5 100644
--- a/scripts/task-runner.service
+++ b/scripts/task-runner.service
@@ -3,6 +3,7 @@ Description=Run Redis tasks
After=network.target
[Service]
+SyslogIdentifier=task-runner
Type=notify
ExecStart=/usr/bin/python /home/guillaume/projects/code/python/task_runner.py
WorkingDirectory=/home/guillaume/projects/code/python
@@ -13,6 +14,7 @@ Environment=BASE_DIR=/home/serenitas/CorpCDOs
Environment=OMP_NUM_THREADS=4
Environment='R_LIBS_USER=/home/guillaume/R/%%p-library/%%v'
Environment=PGPASSFILE=/home/guillaume/.pgpass
+Environment=REDIS_HOST=ziggy
Restart=always
RestartSec=3