commit 6d8e3c1c6a6955a68539f870357669ed0bb0d9c1
parent c0010b9fb6af43268e8386a54a63accf8345d12c
Author: Friedel Schön <[email protected]>
Date: Thu, 25 May 2023 14:31:13 +0200
remove force-socket (-f)
Diffstat:
8 files changed, 13 insertions(+), 45 deletions(-)
diff --git a/include/config.h b/include/config.h
@@ -62,12 +62,12 @@
// the current version
#ifndef SV_VERSION
-# define SV_VERSION "0.2.2"
+# define SV_VERSION "0.3.0"
#endif
// time to wait to accept new connection
-#ifndef SV_ACCEPT_INTERVAL
-# define SV_ACCEPT_INTERVAL 1 // seconds
+#ifndef SV_CHECK_INTERVAL
+# define SV_CHECK_INTERVAL 3 // seconds
#endif
// control socket (%s is the runlevel)
@@ -115,10 +115,6 @@
# define SV_LOG_DIR "/var/log/fiss"
#endif
-#ifndef SV_PID_BUFFER
-# define SV_PID_BUFFER 16
-#endif
-
#ifndef SV_SOCKET_SERVICE_MAX
# define SV_SOCKET_SERVICE_MAX 128
#endif
@@ -135,10 +131,6 @@
# define SV_VLOGGER_BUFFER 1024
#endif
-#ifndef SV_RUNIT_COMPAT
-# define SV_RUNIT_COMPAT 1
-#endif
-
#ifndef SV_STATUS_WAIT
# define SV_STATUS_WAIT 5
#endif
diff --git a/include/parse.h b/include/parse.h
@@ -5,7 +5,6 @@
#include <unistd.h>
-void parse_env_file(char** env);
-void parse_param_file(service_t* s, char* args[]);
-pid_t parse_pid_file(service_t* s);
-int parse_ugid(char* str, uid_t* uid, gid_t* gids);
+void parse_env_file(char** env);
+void parse_param_file(service_t* s, char* args[]);
+int parse_ugid(char* str, uid_t* uid, gid_t* gids);
diff --git a/include/service.h b/include/service.h
@@ -113,6 +113,6 @@ void service_stage(int stage);
void service_start(service_t* s);
const char* service_status_name(service_t* s);
void service_stop(service_t* s);
-int service_supervise(const char* service_dir, const char* runlevel, bool force_socket);
+int service_supervise(const char* service_dir, const char* runlevel);
void service_update_dependency(service_t* s);
void service_update_status(service_t* s);
diff --git a/src/exec/finit.c b/src/exec/finit.c
@@ -68,7 +68,7 @@ int main(int argc, const char** argv) {
sigaction(SIGTERM, &sigact, NULL);
sigaction(SIGINT, &sigact, NULL);
- service_supervise(SV_SERVICE_DIR, SV_RUNLEVEL_DEFAULT, true);
+ service_supervise(SV_SERVICE_DIR, SV_RUNLEVEL_DEFAULT);
sigblock_all(false);
}
diff --git a/src/exec/fsvc.c b/src/exec/fsvc.c
@@ -10,6 +10,7 @@
#include <sys/stat.h>
#include <unistd.h>
+
struct ident {
const char* name;
const char* command;
diff --git a/src/exec/fsvs.c b/src/exec/fsvs.c
@@ -13,7 +13,6 @@
static const struct option long_options[] = {
{ "version", no_argument, 0, 'V' },
- { "force", no_argument, 0, 'f' },
{ 0 }
};
@@ -24,16 +23,11 @@ static void signal_interrupt(int signum) {
}
int main(int argc, char** argv) {
- bool force_socket = false;
-
int c;
- while ((c = getopt_long(argc, argv, ":Vf", long_options, NULL)) > 0) {
+ while ((c = getopt_long(argc, argv, ":V", long_options, NULL)) > 0) {
switch (c) {
case 'V':
print_version_exit();
- case 'f':
- force_socket = true;
- break;
default:
case '?':
if (optopt)
@@ -60,5 +54,5 @@ int main(int argc, char** argv) {
signal(SIGINT, signal_interrupt);
signal(SIGCONT, signal_interrupt);
- return service_supervise(argv[0], argv[1], force_socket);
+ return service_supervise(argv[0], argv[1]);
}
diff --git a/src/parse.c b/src/parse.c
@@ -66,24 +66,6 @@ void parse_env_file(char** env) {
env[env_size] = NULL;
}
-
-pid_t parse_pid_file(service_t* s) {
- int pid_file;
- if ((pid_file = openat(s->dir, "pid", O_RDONLY)) == -1)
- return 0;
-
- char buffer[SV_PID_BUFFER];
- int n;
- if ((n = read(pid_file, buffer, sizeof(buffer))) <= 0) {
- close(pid_file);
- return 0;
- }
- buffer[n] = '\0';
-
- close(pid_file);
- return atoi(buffer);
-}
-
/* uid:gid[:gid[:gid]...] */
static int parse_ugid_num(char* str, uid_t* uid, gid_t* gids) {
int i;
diff --git a/src/supervise.c b/src/supervise.c
@@ -88,7 +88,7 @@ static void control_sockets(void) {
}
}
-int service_supervise(const char* service_dir_, const char* runlevel_, bool force_socket) {
+int service_supervise(const char* service_dir_, const char* runlevel_) {
struct sigaction sigact = { 0 };
sigact.sa_handler = signal_child;
sigaction(SIGCHLD, &sigact, NULL);
@@ -116,7 +116,7 @@ int service_supervise(const char* service_dir_, const char* runlevel_, bool forc
service_refresh_directory();
check_services();
control_sockets();
- sleep(1);
+ sleep(SV_CHECK_INTERVAL);
}
