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

diff --git a/appimage/ctdlvisor.c b/appimage/ctdlvisor.c
index a3f52f5cb..cfeaf290a 100644
--- a/appimage/ctdlvisor.c
+++ b/appimage/ctdlvisor.c
@@ -25,9 +25,47 @@
 #include <string.h>
 #include <limits.h>
 
+void main_loop(void);
+void run_in_foreground(void);
+
 char *data_directory = "/usr/local/citadel";
 char *http_port = "80";
 char *https_port = "443";
+pid_t citserver_pid;
+pid_t webcit_pid;
+pid_t webcits_pid;
+
+
+void signal_handler(int signal) {
+	fprintf(stderr, "ctdlvisor: caught signal %d\n", signal);
+
+	int status;
+	pid_t who_exited;
+	char *what_exited = NULL;
+
+	do {
+		fprintf(stderr, "ctdlvisor: waiting for any child process to exit...\n");
+		who_exited = waitpid(-1, &status, 0);
+		if (who_exited == citserver_pid) {
+			what_exited = "Citadel Server";
+		}
+		else if (who_exited == webcit_pid) {
+			what_exited = "WebCit HTTP";
+		}
+		else if (who_exited == webcits_pid) {
+			what_exited = "WebCit HTTPS";
+		}
+		else {
+			what_exited = "unknown";
+		}
+		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);
+}
+
+
 
 pid_t start_citadel() {
 	char bin[1024];
@@ -35,8 +73,8 @@ pid_t start_citadel() {
 	pid_t pid = fork();
 	if (pid == 0) {
 		fprintf(stderr, "ctdlvisor: executing %s\n", bin);
+		close(0); close(1); close(2);
 		execlp(bin, "citserver", "-x9", "-h", data_directory, NULL);
-		perror("execlp");
 		exit(errno);
 	}
 	else {
@@ -53,8 +91,8 @@ pid_t start_webcit() {
 	pid_t pid = fork();
 	if (pid == 0) {
 		fprintf(stderr, "ctdlvisor: executing %s\n", bin);
+		close(0); close(1); close(2);
 		execlp(bin, "webcit", "-x9", wchome, "-p", http_port, "uds", data_directory, NULL);
-		perror("execlp");
 		exit(errno);
 	}
 	else {
@@ -71,8 +109,8 @@ pid_t start_webcits() {
 	pid_t pid = fork();
 	if (pid == 0) {
 		fprintf(stderr, "ctdlvisor: executing %s\n", bin);
+		close(0); close(1); close(2);
 		execlp(bin, "webcit", "-x9", wchome, "-s", "-p", https_port, "uds", data_directory, NULL);
-		perror("execlp");
 		exit(errno);
 	}
 	else {
@@ -81,13 +119,12 @@ 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"
+;
+
 int main(int argc, char **argv) {
-	pid_t citserver_pid;
-	pid_t webcit_pid;
-	pid_t webcits_pid;
-	int shutting_down = 0;
-	int status;
-	pid_t who_exited;
 	int c;
 
 	while ((c = getopt (argc, argv, "h:p:s:")) != -1)  switch(c) {
@@ -101,10 +138,29 @@ int main(int argc, char **argv) {
 			https_port = optarg;
 			break;
 		default:
-			fprintf(stderr, "ctdlvisor: usage: ctdlvisor [-h data_directory] [-p http_port] [-s https_port]\n");
+			fprintf(stderr, "%s", usage);
 			exit(1);
 	}
 
+
+	if (argc != optind+1) {
+		fprintf(stderr, "%s", usage);
+		exit(1);
+	}
+
+	if (!strcasecmp(argv[optind], "run")) {
+		run_in_foreground();
+	}
+	else {
+		fprintf(stderr, "%s", usage);
+		exit(1);
+	}
+
+	exit(0);
+}
+
+
+void run_in_foreground(void) {
 	fprintf(stderr, "ctdlvisor: Welcome to the Citadel System, brought to you using AppImage.\n");
 	fprintf(stderr, "ctdlvisor: LD_LIBRARY_PATH = %s\n", getenv("LD_LIBRARY_PATH"));
 	fprintf(stderr, "ctdlvisor:            PATH = %s\n", getenv("PATH"));
@@ -118,10 +174,25 @@ int main(int argc, char **argv) {
 		exit(errno);
 	}
 
+	signal(SIGTERM, signal_handler);
+	signal(SIGHUP, signal_handler);
+	signal(SIGINT, signal_handler);
+	signal(SIGQUIT, signal_handler);
+
 	citserver_pid = start_citadel();
 	webcit_pid = start_webcit();
 	webcits_pid = start_webcits();
 
+	main_loop();
+}
+
+
+void main_loop(void) {
+	int status;
+	pid_t who_exited;
+	int shutting_down = 0;
+	int citserver_exit_code = 0;
+
 	do {
 		fprintf(stderr, "ctdlvisor: waiting for any child process to exit...\n");
 		who_exited = waitpid(-1, &status, 0);
@@ -130,26 +201,33 @@ int main(int argc, char **argv) {
 		// A *deliberate* exit of citserver will cause ctdlvisor to shut the whole AppImage down.
 		// If it crashes, however, we will start it back up.
 		if (who_exited == citserver_pid) {
-			if (WEXITSTATUS(status) == 0) {
+			citserver_exit_code = WEXITSTATUS(status);
+			if (citserver_exit_code == 0) {
 				fprintf(stderr, "ctdlvisor: citserver exited normally - ending AppImage session\n");
 				shutting_down = 1;
 				kill(webcit_pid, SIGTERM);
 				kill(webcits_pid, SIGTERM);
 			}
+			else if ((citserver_exit_code >= 101) && (citserver_exit_code <= 109)) {
+				fprintf(stderr, "ctdlvisor: citserver exited intentionally - ending AppImage session\n");
+				shutting_down = 1;
+				kill(webcit_pid, SIGTERM);
+				kill(webcits_pid, SIGTERM);
+			}
 			else {
 				citserver_pid = start_citadel();
 			}
 		}
 
 		// WebCit processes are restarted if they exit for any reason.
-		if ((who_exited == webcit_pid) && (!shutting_down))		webcit_pid = start_webcit();
-		if ((who_exited == webcits_pid) && (!shutting_down))		webcits_pid = start_webcits();
+		if ((who_exited == webcit_pid) && (!shutting_down))	webcit_pid = start_webcit();
+		if ((who_exited == webcits_pid)	&& (!shutting_down))	webcits_pid = start_webcits();
 
 		// If we somehow end up in an endless loop, at least slow it down.
 		sleep(1);
 
-	} while ((who_exited >= 0) && (shutting_down == 0));
+	} while (who_exited >= 0);
 
-	printf("ctdlvisor: exiting.\n");
-	exit(0);
+	printf("ctdlvisor: exit code %d\n", citserver_exit_code);
+	exit(citserver_exit_code);
 }