X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=appimage%2Fctdlvisor.c;h=7bcf5efbd29d50bf5206237496d0d7677d851cfd;hb=6f1e0c89501aa95ff55e83ebfca511fdd1ead0ca;hp=cfeaf290a526f4cf767eedcbb9e64f18a8668c01;hpb=a21e4807aaeb75019e25e5b17cc304fe549691fd;p=citadel.git

diff --git a/appimage/ctdlvisor.c b/appimage/ctdlvisor.c
index cfeaf290a..7bcf5efbd 100644
--- a/appimage/ctdlvisor.c
+++ b/appimage/ctdlvisor.c
@@ -24,6 +24,8 @@
 #include <signal.h>
 #include <string.h>
 #include <limits.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 void main_loop(void);
 void run_in_foreground(void);
@@ -34,17 +36,33 @@ char *https_port = "443";
 pid_t citserver_pid;
 pid_t webcit_pid;
 pid_t webcits_pid;
+int shutting_down = 0;
+
+
+void ctdlvisor_exit(int code) {
+	printf("ctdlvisor: exit code %d\n", code);
+	exit(code);
+}
 
 
 void signal_handler(int signal) {
 	fprintf(stderr, "ctdlvisor: caught signal %d\n", signal);
 
+	while(shutting_down) {
+		fprintf(stderr, "ctdlvisor: already shutting down\n");
+		sleep(1);
+	}
+
 	int status;
 	pid_t who_exited;
 	char *what_exited = NULL;
 
+	shutting_down = 1;
+	kill(citserver_pid, SIGTERM);
+	kill(webcit_pid, SIGTERM);
+	kill(webcits_pid, SIGTERM);
 	do {
-		fprintf(stderr, "ctdlvisor: waiting for any child process to exit...\n");
+		fprintf(stderr, "ctdlvisor: waiting for all child process to exit...\n");
 		who_exited = waitpid(-1, &status, 0);
 		if (who_exited == citserver_pid) {
 			what_exited = "Citadel Server";
@@ -61,19 +79,34 @@ void signal_handler(int signal) {
 		fprintf(stderr, "ctdlvisor: pid=%d (%s) exited, status=%d, exitcode=%d\n", who_exited, what_exited, status, WEXITSTATUS(status));
 	} while (who_exited >= 0);
 
-	printf("ctdlvisor: exiting from signal catcher.\n");
-	exit(0);
+	ctdlvisor_exit(0);
 }
 
 
 
+void detach_from_tty(void) {
+	signal(SIGHUP, SIG_IGN);
+	signal(SIGINT, SIG_IGN);
+	signal(SIGQUIT, SIG_IGN);
+
+	setsid();
+	umask(0);
+	if (    (freopen("/dev/null", "r", stdin) != stdin) ||
+		(freopen("/dev/null", "w", stdout) != stdout) ||
+		(freopen("/dev/null", "w", stderr) != stderr)
+	) {
+		fprintf(stderr, "sysdep: unable to reopen stdio: %s\n", strerror(errno));
+	}
+}
+
+
 pid_t start_citadel() {
 	char bin[1024];
 	sprintf(bin, "%s/usr/local/citadel/citserver", getenv("APPDIR"));
 	pid_t pid = fork();
 	if (pid == 0) {
 		fprintf(stderr, "ctdlvisor: executing %s\n", bin);
-		close(0); close(1); close(2);
+		detach_from_tty();
 		execlp(bin, "citserver", "-x9", "-h", data_directory, NULL);
 		exit(errno);
 	}
@@ -91,7 +124,7 @@ pid_t start_webcit() {
 	pid_t pid = fork();
 	if (pid == 0) {
 		fprintf(stderr, "ctdlvisor: executing %s\n", bin);
-		close(0); close(1); close(2);
+		detach_from_tty();
 		execlp(bin, "webcit", "-x9", wchome, "-p", http_port, "uds", data_directory, NULL);
 		exit(errno);
 	}
@@ -109,7 +142,7 @@ pid_t start_webcits() {
 	pid_t pid = fork();
 	if (pid == 0) {
 		fprintf(stderr, "ctdlvisor: executing %s\n", bin);
-		close(0); close(1); close(2);
+		detach_from_tty();
 		execlp(bin, "webcit", "-x9", wchome, "-s", "-p", https_port, "uds", data_directory, NULL);
 		exit(errno);
 	}
@@ -121,7 +154,11 @@ pid_t start_webcits() {
 
 static char *usage =
 	"ctdlvisor: usage: ctdlvisor [-h data_directory] [-p http_port] [-s https_port] command\n"
-	"           'command' must be one of: run, install, start, stop\n"
+	"           'command' must be one of:\n"
+	"           run     - start Citadel services in the foreground without detaching\n"
+	"           install - deploy systemd unit files for automatic startup at boot\n"
+	"           upgrade - check for new version of the software\n"
+	"           test    - check this appimage for compatibility with your system\n"
 ;
 
 int main(int argc, char **argv) {
@@ -151,6 +188,15 @@ int main(int argc, char **argv) {
 	if (!strcasecmp(argv[optind], "run")) {
 		run_in_foreground();
 	}
+	else if (!strcasecmp(argv[optind], "install")) {
+		fprintf(stderr, "oops, this is not implemented yet\n");
+	}
+	else if (!strcasecmp(argv[optind], "upgrade")) {
+		fprintf(stderr, "oops, this is not implemented yet\n");
+	}
+	else if (!strcasecmp(argv[optind], "test")) {
+		fprintf(stderr, "oops, this is not implemented yet\n");
+	}
 	else {
 		fprintf(stderr, "%s", usage);
 		exit(1);
@@ -184,13 +230,13 @@ void run_in_foreground(void) {
 	webcits_pid = start_webcits();
 
 	main_loop();
+	exit(0);
 }
 
 
 void main_loop(void) {
 	int status;
 	pid_t who_exited;
-	int shutting_down = 0;
 	int citserver_exit_code = 0;
 
 	do {
@@ -228,6 +274,5 @@ void main_loop(void) {
 
 	} while (who_exited >= 0);
 
-	printf("ctdlvisor: exit code %d\n", citserver_exit_code);
-	exit(citserver_exit_code);
+	ctdlvisor_exit(citserver_exit_code);
 }