commit 690ec0ef91b5ed2ae5be5c5119e29b18464168e9
parent 49daf6b018e90ebe7af2636ad10ea9431ad68d71
Author: Friedel Schön <[email protected]>
Date: Wed, 17 May 2023 01:37:43 +0200
adding SV_RUNIT_COMPAT to config.h
Diffstat:
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/include/config.h b/include/config.h
@@ -70,8 +70,6 @@
# define SV_ACCEPT_INTERVAL 1 // seconds
#endif
-#define SV_CONTROL_SOCKET "/home/friedel/fiss-%s.sock"
-
// control socket (%s is the runlevel)
#ifndef SV_CONTROL_SOCKET
# define SV_CONTROL_SOCKET "/run/fiss/control-%s.socket"
@@ -136,3 +134,7 @@
#ifndef SV_VLOGGER_BUFFER
# define SV_VLOGGER_BUFFER 1024
#endif
+
+#ifndef SV_RUNIT_COMPAT
+# define SV_RUNIT_COMPAT 1
+#endif
diff --git a/src/runit.c b/src/runit.c
@@ -20,6 +20,7 @@ static int runit_signals[] = {
};
void service_init_status(service_t* s) {
+#if SV_RUNIT_COMPAT != 0
int lockfd;
struct stat st;
@@ -47,9 +48,11 @@ void service_init_status(service_t* s) {
return;
}
close(lockfd);
+#endif
}
void service_update_status(service_t* s) {
+#if SV_RUNIT_COMPAT != 0
int fd;
if ((fd = openat(s->dir, "supervise/status", O_CREAT | O_WRONLY | O_TRUNC, 0644)) == -1) {
print_error("cannot open supervise/status: %s\n");
@@ -87,9 +90,11 @@ void service_update_status(service_t* s) {
dprintf(fd, "%d", s->pid);
close(fd);
+#endif
}
void service_handle_command_runit(service_t* s, sv_command_runit_t command) {
+#if SV_RUNIT_COMPAT != 0
switch (command) {
case R_DOWN:
case R_TERM:
@@ -135,4 +140,5 @@ void service_handle_command_runit(service_t* s, sv_command_runit_t command) {
s->status_change = time(NULL);
service_update_status(s);
+#endif
}
diff --git a/src/supervise.c b/src/supervise.c
@@ -88,6 +88,7 @@ static void accept_socket(void) {
}
static void control_sockets(void) {
+#if SV_RUNIT_COMPAT != 0
service_t* s;
char cmd;
for (int i = 0; i < services_size; i++) {
@@ -97,6 +98,7 @@ static void control_sockets(void) {
service_handle_command_runit(s, cmd);
}
}
+#endif
}
int service_supervise(const char* service_dir_, const char* runlevel_, bool force_socket) {
