improvements

omnect · Apr 25, 2024 · 32ea784 · 32ea784
1 parent 37fae3f
commit 32ea784
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/twin/web_service.rs b/src/twin/web_service.rs
@@ -26,9 +26,9 @@ impl WebService {
             An example for a complete generic handling can be found in iot-identity-service code:
             https://github.com/Azure/iot-identity-service/blob/main/http-common/src/connector.rs
 
-            The socket is not reliable removed by systemd when the service stops, crashes or return with an error.
-            As a result sometimes files or directories with wrong permissions are created. Thus we to cleanup in
-            systemd "ExecStartPre" and "ExecStopPost".
+            The socket is not reliable removed by systemd when the service stops, crashes or returns with an error.
+            As a result sometimes files or directories with wrong permissions are created. Thus we cleanup socket in
+            omnect-device-service.socket "ExecStartPre" and "ExecStopPost".
         */
         const SOCKET_FDS_IDX: std::os::unix::io::RawFd = 3;
 

diff --git a/systemd/omnect-device-service.exec_stop_post.sh b/systemd/omnect-device-service.exec_stop_post.sh
@@ -1,6 +1,5 @@
 #!/bin/bash -x
 script=${0}
-socket_file="/run/omnect-device-service/api.sock"
 update_validation_file="/run/omnect-device-service/omnect_validate_update"
 barrier_json="/run/omnect-device-service/omnect_validate_update_complete_barrier"
 max_restart_count=9
@@ -13,8 +12,6 @@ function reboot() {
   dbus-send --system --print-reply --dest=org.freedesktop.login1 /org/freedesktop/login1 "org.freedesktop.login1.Manager.Reboot" boolean:true
 }
 
-rm -rf ${socket_file}
-
 # for now we ignore SERVICE_RESULT and EXIT_STATUS. however it does potentially
 # make sense to reboot on certain combinations even if restart_count < max_restart_count
 # or update validation is not yet timeouted. (we have to gain experience.)

diff --git a/systemd/omnect-device-service.service b/systemd/omnect-device-service.service
@@ -19,7 +19,6 @@ Group=omnect_device_service
 WatchdogSec=30s
 
 ExecStart=/usr/bin/omnect-device-service
-ExecStartPre=/usr/bin/omnect-device-service.exec_start_pre.sh
 ExecStopPost=/usr/bin/omnect-device-service.exec_stop_post.sh
 
 [Install]

diff --git a/systemd/omnect-device-service.socket b/systemd/omnect-device-service.socket
@@ -8,5 +8,8 @@ SocketMode=0660
 SocketUser=omnect_device_service
 SocketGroup=omnect_device_socket
 
+ExecStartPre=+rm -rf /run/omnect-device-service/api.sock
+ExecStopPost=+rm -rf /run/omnect-device-service/api.sock
+
 [Install]
 WantedBy=sockets.target