X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=appimage%2Fctdlvisor.c;h=405a56bdaed68426601981707e640e7a29613387;hb=5b4f25945be356aa3a8797e70bbe16355538a967;hp=4bc4696b027fcd5b642124de290a3fe342a20fc8;hpb=bcf3a77820854f20ce20d8227411e837904099a4;p=citadel.git

diff --git a/appimage/ctdlvisor.c b/appimage/ctdlvisor.c
index 4bc4696b0..405a56bda 100644
--- a/appimage/ctdlvisor.c
+++ b/appimage/ctdlvisor.c
@@ -71,17 +71,18 @@ void signal_handler(int signal) {
 		else {
 			what_exited = "unknown";
 		}
-		if (WIFEXITED(status)) {
-			fprintf(stderr, "ctdlvisor: %d (%s) exited, exitcode=%d\n", who_exited, what_exited, WEXITSTATUS(status));
-		}
-		else if (WIFSIGNALED(status)) {
-			fprintf(stderr, "ctdlvisor: %d (%s) crashed, signal=%d\n", who_exited, what_exited, WTERMSIG(status));
-		}
-		else {
-			fprintf(stderr, "ctdlvisor: %d (%s) ended, status=%d\n", who_exited, what_exited, status);
+		if (who_exited >= 0) {
+			if (WIFEXITED(status)) {
+				fprintf(stderr, "ctdlvisor: %d (%s) exited, exitcode=%d\n", who_exited, what_exited, WEXITSTATUS(status));
+			}
+			else if (WIFSIGNALED(status)) {
+				fprintf(stderr, "ctdlvisor: %d (%s) crashed, signal=%d\n", who_exited, what_exited, WTERMSIG(status));
+			}
+			else {
+				fprintf(stderr, "ctdlvisor: %d (%s) ended, status=%d\n", who_exited, what_exited, status);
+			}
 		}
 	} while (who_exited >= 0);
-
 	ctdlvisor_exit(0);
 }
 
@@ -107,12 +108,13 @@ pid_t start_citadel() {
 	sprintf(bin, "%s/usr/local/citadel/citserver", getenv("APPDIR"));
 	pid_t pid = fork();
 	if (pid == 0) {
-		fprintf(stderr, "ctdlvisor: executing %s\n", bin);
+		fprintf(stderr, "ctdlvisor: executing %s with data directory %s\n", bin, getenv("CTDL_DIR"));
 		detach_from_tty();
 		execlp(bin, "citserver", "-x9", "-h", getenv("CTDL_DIR"), NULL);
 		exit(errno);
 	}
 	else {
+		fprintf(stderr, "ctdlvisor: citserver running on pid=%d\n", pid);
 		return(pid);
 	}
 }
@@ -131,6 +133,7 @@ pid_t start_webcit() {
 		exit(errno);
 	}
 	else {
+		fprintf(stderr, "ctdlvisor: webcit (HTTP) running on pid=%d\n", pid);
 		return(pid);
 	}
 }
@@ -149,6 +152,7 @@ pid_t start_webcits() {
 		exit(errno);
 	}
 	else {
+		fprintf(stderr, "ctdlvisor: webcit (HTTPS) running on pid=%d\n", pid);
 		return(pid);
 	}
 }
@@ -177,7 +181,6 @@ void main_loop(void) {
 	int citserver_exit_code = 0;
 
 	do {
-		fprintf(stderr, "ctdlvisor: waiting for any child process to exit...\n");
 		who_exited = waitpid(-1, &status, 0);
 		fprintf(stderr, "ctdlvisor: pid=%d exited, status=%d, exitcode=%d\n", who_exited, status, WEXITSTATUS(status));