You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by bo...@apache.org on 2017/01/16 21:24:04 UTC
[2/4] incubator-airflow git commit: [AIRFLOW-760] Update systemd
config
[AIRFLOW-760] Update systemd config
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/f3e18fbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/f3e18fbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/f3e18fbe
Branch: refs/heads/master
Commit: f3e18fbe022714f3a8a82040750db0b1ade9845a
Parents: 648bd4e
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Sat Jan 14 21:32:27 2017 +0100
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Sat Jan 14 21:32:27 2017 +0100
----------------------------------------------------------------------
scripts/systemd/airflow-flower.service | 3 +--
scripts/systemd/airflow-kerberos.service | 3 +--
scripts/systemd/airflow-scheduler.service | 1 -
scripts/systemd/airflow-webserver.service | 7 ++-----
scripts/systemd/airflow-worker.service | 2 +-
5 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f3e18fbe/scripts/systemd/airflow-flower.service
----------------------------------------------------------------------
diff --git a/scripts/systemd/airflow-flower.service b/scripts/systemd/airflow-flower.service
index 4d524e8..de298c6 100644
--- a/scripts/systemd/airflow-flower.service
+++ b/scripts/systemd/airflow-flower.service
@@ -22,9 +22,8 @@ User=airflow
Group=airflow
Type=simple
ExecStart=/bin/airflow flower
-KillMode=process
Restart=on-failure
-RestartSec=42s
+RestartSec=5s
[Install]
WantedBy=multi-user.target
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f3e18fbe/scripts/systemd/airflow-kerberos.service
----------------------------------------------------------------------
diff --git a/scripts/systemd/airflow-kerberos.service b/scripts/systemd/airflow-kerberos.service
index 9c4ed6b..6113595 100644
--- a/scripts/systemd/airflow-kerberos.service
+++ b/scripts/systemd/airflow-kerberos.service
@@ -22,9 +22,8 @@ User=airflow
Group=airflow
Type=simple
ExecStart=/bin/airflow kerberos
-KillMode=process
Restart=on-failure
-RestartSec=42s
+RestartSec=5s
[Install]
WantedBy=multi-user.target
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f3e18fbe/scripts/systemd/airflow-scheduler.service
----------------------------------------------------------------------
diff --git a/scripts/systemd/airflow-scheduler.service b/scripts/systemd/airflow-scheduler.service
index 8c541cd..95229d6 100644
--- a/scripts/systemd/airflow-scheduler.service
+++ b/scripts/systemd/airflow-scheduler.service
@@ -22,7 +22,6 @@ User=airflow
Group=airflow
Type=simple
ExecStart=/bin/airflow scheduler -n ${SCHEDULER_RUNS}
-KillMode=process
Restart=always
RestartSec=5s
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f3e18fbe/scripts/systemd/airflow-webserver.service
----------------------------------------------------------------------
diff --git a/scripts/systemd/airflow-webserver.service b/scripts/systemd/airflow-webserver.service
index 73445fe..e39083e 100644
--- a/scripts/systemd/airflow-webserver.service
+++ b/scripts/systemd/airflow-webserver.service
@@ -17,16 +17,13 @@ After=network.target postgresql.service mysql.service redis.service rabbitmq-ser
Wants=postgresql.service mysql.service redis.service rabbitmq-server.service
[Service]
-PIDFile=/run/airflow/webserver.pid
EnvironmentFile=/etc/sysconfig/airflow
User=airflow
Group=airflow
-Type=forking
+Type=simple
ExecStart=/bin/airflow webserver --pid /run/airflow/webserver.pid
-ExecReload=/bin/kill -s HUP $MAINPID
-ExecStop=/bin/kill -s TERM $MAINPID
Restart=on-failure
-RestartSec=42s
+RestartSec=5s
PrivateTmp=true
[Install]
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f3e18fbe/scripts/systemd/airflow-worker.service
----------------------------------------------------------------------
diff --git a/scripts/systemd/airflow-worker.service b/scripts/systemd/airflow-worker.service
index 7531824..81ea353 100644
--- a/scripts/systemd/airflow-worker.service
+++ b/scripts/systemd/airflow-worker.service
@@ -23,7 +23,7 @@ Group=airflow
Type=simple
ExecStart=/bin/airflow worker
Restart=on-failure
-RestartSec=42s
+RestartSec=10s
[Install]
WantedBy=multi-user.target
\ No newline at end of file