From d41708ee247ce5efc5dc06f2d233e8d620fc6e4a Mon Sep 17 00:00:00 2001
From: Thomas Mangin <thomas.mangin@exa.net.uk>
Date: Sat, 23 May 2020 07:09:10 +0100
Subject: http-api: T2494: always exit with non zero on failure

systemd is setup with Restart=on-failure thereforer the service
will only be restarted if the daemon died and reported an error.
Previously any OsError would cause a exit(0) and therefore the
API would not have been restarted.

https://www.freedesktop.org/software/systemd/man/systemd.service.html
---
 src/services/vyos-http-api-server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/services/vyos-http-api-server')

diff --git a/src/services/vyos-http-api-server b/src/services/vyos-http-api-server
index 4c41fa96d..b256add98 100755
--- a/src/services/vyos-http-api-server
+++ b/src/services/vyos-http-api-server
@@ -400,4 +400,4 @@ if __name__ == '__main__':
         serve(app, host=server_config["listen_address"],
                    port=server_config["port"])
     except OSError as e:
-        print(f"OSError {e}")
+        sys.exit(f"OSError {e}")
-- 
cgit v1.2.3


From d9fbad6a6bbba292f31fe50e57af893062c7a584 Mon Sep 17 00:00:00 2001
From: Thomas Mangin <thomas.mangin@exa.net.uk>
Date: Sat, 23 May 2020 07:33:47 +0100
Subject: systemd: T2494: use Type=notify with daemon

Notify systemd via the notify API when the python daemon are
ready to take connection

https://github.com/torfsen/python-systemd-tutorial
---
 debian/control                    | 1 +
 src/services/vyos-hostsd          | 1 +
 src/services/vyos-http-api-server | 2 ++
 src/systemd/vyos-hostsd.service   | 2 +-
 src/systemd/vyos-http-api.service | 2 +-
 5 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/services/vyos-http-api-server')

diff --git a/debian/control b/debian/control
index 5e14340a8..aaf8fa1e7 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Depends: python3,
   python3-xmltodict,
   python3-pyudev,
   python3-voluptuous,
+  python3-systemd,
   bsdmainutils,
   cron,
   etherwake,
diff --git a/src/services/vyos-hostsd b/src/services/vyos-hostsd
index 0079f7e5c..53ac5a770 100755
--- a/src/services/vyos-hostsd
+++ b/src/services/vyos-hostsd
@@ -592,6 +592,7 @@ if __name__ == '__main__':
     socket.bind(SOCKET_PATH)
     os.umask(o_mask)
 
+    systemd.daemon.notify('READY=1')
     while True:
         #  Wait for next request from client
         msg_json = socket.recv().decode()
diff --git a/src/services/vyos-http-api-server b/src/services/vyos-http-api-server
index b256add98..38bf2f8ce 100755
--- a/src/services/vyos-http-api-server
+++ b/src/services/vyos-http-api-server
@@ -28,6 +28,7 @@ import vyos.config
 
 from flask import Flask, request
 from waitress import serve
+import systemd.daemon
 
 from functools import wraps
 
@@ -396,6 +397,7 @@ if __name__ == '__main__':
 
     signal.signal(signal.SIGTERM, sig_handler)
 
+    systemd.daemon.notify('READY=1')
     try:
         serve(app, host=server_config["listen_address"],
                    port=server_config["port"])
diff --git a/src/systemd/vyos-hostsd.service b/src/systemd/vyos-hostsd.service
index b77335778..418601d1a 100644
--- a/src/systemd/vyos-hostsd.service
+++ b/src/systemd/vyos-hostsd.service
@@ -14,7 +14,7 @@ WorkingDirectory=/run/vyos-hostsd
 RuntimeDirectory=vyos-hostsd
 RuntimeDirectoryPreserve=yes
 ExecStart=/usr/bin/python3 -u /usr/libexec/vyos/services/vyos-hostsd
-Type=idle
+Type=notify
 KillMode=process
 
 SyslogIdentifier=vyos-hostsd
diff --git a/src/systemd/vyos-http-api.service b/src/systemd/vyos-http-api.service
index 4fa68b4ff..636973be7 100644
--- a/src/systemd/vyos-http-api.service
+++ b/src/systemd/vyos-http-api.service
@@ -6,7 +6,7 @@ Requires=vyos-router.service
 [Service]
 ExecStartPre=/usr/libexec/vyos/init/vyos-config
 ExecStart=/usr/bin/python3 -u /usr/libexec/vyos/services/vyos-http-api-server
-Type=idle
+Type=notify
 KillMode=process
 
 SyslogIdentifier=vyos-http-api
-- 
cgit v1.2.3