first attempt at proper service/socket logic

1 files changed, 32 insertions, 19 deletions

diff --git a/service.h b/service.h
index d7f2c708dd..41dabff5cb 100644
--- a/service.h
+++ b/service.h
@@ -6,8 +6,6 @@
 typedef struct Service Service;
 
 #include "name.h"
-#include "socket.h"
-#include "timer.h"
 
 typedef enum ServiceState {
         SERVICE_DEAD,
@@ -15,31 +13,34 @@ typedef enum ServiceState {
         SERVICE_START,
         SERVICE_START_POST,
         SERVICE_RUNNING,
-        SERVICE_RELOAD_PRE,
         SERVICE_RELOAD,
-        SERVICE_RELOAD_POST,
-        SERVICE_STOP_PRE,
-        SERVICE_STOP,
-        SERVICE_SIGTERM,
-        SERVICE_SIGKILL,
+        SERVICE_STOP,              /* No STOP_PRE state, instead just register multiple STOP executables */
+        SERVICE_STOP_SIGTERM,
+        SERVICE_STOP_SIGKILL,
         SERVICE_STOP_POST,
+        SERVICE_FINAL_SIGTERM,     /* In case the STOP_POST executable hangs, we shoot that down, too */
+        SERVICE_FINAL_SIGKILL,
         SERVICE_MAINTAINANCE,
+        SERVICE_AUTO_RESTART,
         _SERVICE_STATE_MAX,
 } ServiceState;
 
-typedef enum ServiceMode {
+typedef enum ServiceRestart {
         SERVICE_ONCE,
-        SERVICE_RESTART
-} ServiceMode;
+        SERVICE_RESTART_ON_SUCCESS,
+        SERVICE_RESTART_ALWAYS
+} ServiceRestart;
+
+typedef enum ServiceType {
+        SERVICE_FORKING,
+        SERVICE_SIMPLE
+} ServiceType;
 
 typedef enum ServiceExecCommand {
         SERVICE_EXEC_START_PRE,
         SERVICE_EXEC_START,
         SERVICE_EXEC_START_POST,
-        SERVICE_EXEC_RELOAD_PRE,
         SERVICE_EXEC_RELOAD,
-        SERVICE_EXEC_RELOAD_POST,
-        SERVICE_EXEC_STOP_PRE,
         SERVICE_EXEC_STOP,
         SERVICE_EXEC_STOP_POST,
         _SERVICE_EXEC_MAX
@@ -48,16 +49,28 @@ typedef enum ServiceExecCommand {
 struct Service {
         Meta meta;
 
-        ServiceState state;
-        ServiceMode mode;
+        ServiceType type;
+        ServiceRestart restart;
+
+        /* If set we'll read the main daemon PID from this file */
+        char *pid_file;
+
+        usec_t restart_usec;
+        usec_t timeout_usec;
 
         ExecCommand* exec_command[_SERVICE_EXEC_MAX];
         ExecContext exec_context;
 
-        pid_t service_pid, control_pid;
+        ServiceState state;
+
+        ExecStatus main_exec_status;
+
+        ExecCommand *control_command;
+        pid_t main_pid, control_pid;
+        bool main_pid_known:1;
 
-        Socket *socket;
-        Timer *timer;
+        bool failure:1; /* if we shut down, remember why */
+        int timer_id;
 };
 
 const NameVTable service_vtable;