From c01acbd47b82c431dcd17607cc1a03ca3d98ce13 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Tue, 12 Feb 2019 12:24:33 +0100
Subject: [PATCH] runner: Migrate to use the swh-scheduler cli as entry point
Related T1525
---
data/defaults.yaml | 1 +
site-modules/profile/manifests/swh/deploy/scheduler.pp | 2 ++
.../swh/deploy/scheduler/swh-scheduler-runner.service.erb | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/data/defaults.yaml b/data/defaults.yaml
index 6be162ab5..7c8661145 100644
--- a/data/defaults.yaml
+++ b/data/defaults.yaml
@@ -1718,6 +1718,7 @@ swh::deploy::scheduler::db::user: swhscheduler
# swh::deploy::scheduler::task_broker::password in private data
swh::deploy::scheduler::task_broker: "amqp://swhproducer:%{hiera('swh::deploy::scheduler::task_broker::password')}@rabbitmq:5672//"
swh::deploy::scheduler::listener::log_level: INFO
+swh::deploy::scheduler::runner::log_level: INFO
swh::deploy::scheduler::config:
scheduler:
cls: local
diff --git a/site-modules/profile/manifests/swh/deploy/scheduler.pp b/site-modules/profile/manifests/swh/deploy/scheduler.pp
index 69844a807..5ed7c2a98 100644
--- a/site-modules/profile/manifests/swh/deploy/scheduler.pp
+++ b/site-modules/profile/manifests/swh/deploy/scheduler.pp
@@ -6,6 +6,8 @@ class profile::swh::deploy::scheduler {
$config = lookup('swh::deploy::scheduler::config')
$listener_log_level = lookup('swh::deploy::scheduler::listener::log_level')
+ $runner_log_level = lookup('swh::deploy::scheduler::runner::log_level')
+
$task_broker = lookup('swh::deploy::scheduler::task_broker')
$task_packages = lookup('swh::deploy::scheduler::task_packages')
$task_modules = lookup('swh::deploy::scheduler::task_modules')
diff --git a/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb b/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb
index cc6ec84a3..bc76c9e73 100644
--- a/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb
+++ b/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb
@@ -11,7 +11,7 @@ After=network.target rabbitmq-server.service
User=<%= @user %>
Group=<%= @group %>
Type=simple
-ExecStart=/bin/sh -c 'while true; do echo running pending tasks at `/bin/date`...; /usr/bin/python3 -m swh.scheduler.celery_backend.runner; sleep 10; done'
+ExecStart=/usr/bin/swh-scheduler --config-file <%= @config_file %> --log-level <%= @runner_log_level %> runner --period 10
Restart=always
RestartSec=10
--
GitLab