X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=ctdlvisor.c;h=18b420207ce0cc12f4440666e5e73f0027c93426;hb=fda5b37d1404c736c457952aaf22115cf412b317;hp=086f1a64fbacc6bfdc269e4249386ad474a8de9d;hpb=8bf0b0986137cdbd091b89fc74fba597acca8f47;p=citadel-docker.git

diff --git a/ctdlvisor.c b/ctdlvisor.c
index 086f1a6..18b4202 100644
--- a/ctdlvisor.c
+++ b/ctdlvisor.c
@@ -93,7 +93,7 @@ pid_t start_citadel() {
 	pid_t pid = fork();
 	if (pid == 0) {
 		fprintf(stderr, "ctdlvisor: executing citserver\n");
-		//detach_from_tty();
+		detach_from_tty();
 		execlp("/usr/local/citadel/citserver", "citserver", "-x9", "-h", CTDL_DIR, NULL);
 		exit(errno);
 	}
@@ -108,7 +108,7 @@ pid_t start_webcit() {
 	pid_t pid = fork();
 	if (pid == 0) {
 		fprintf(stderr, "ctdlvisor: executing webcit (http)\n");
-		//detach_from_tty();
+		detach_from_tty();
 		execlp("/usr/local/webcit/webcit", "webcit", "-x9", "-p", "80", "uds", CTDL_DIR, NULL);
 		exit(errno);
 	}
@@ -123,7 +123,7 @@ pid_t start_webcits() {
 	pid_t pid = fork();
 	if (pid == 0) {
 		fprintf(stderr, "ctdlvisor: executing webcit (https)\n");
-		//detach_from_tty();
+		detach_from_tty();
 		execlp("/usr/local/webcit/webcit", "webcit", "-x9", "-s", "-p", "443", "uds", CTDL_DIR, NULL);
 		exit(errno);
 	}
@@ -143,18 +143,18 @@ void main_loop(void) {
 		who_exited = waitpid(-1, &status, 0);
 		fprintf(stderr, "ctdlvisor: pid=%d exited, status=%d, exitcode=%d\n", who_exited, status, WEXITSTATUS(status));
 
-		// A *deliberate* exit of citserver will cause ctdlvisor to shut the whole AppImage down.
+		// A *deliberate* exit of citserver will cause ctdlvisor to shut the whole container down.
 		// If it crashes, however, we will start it back up.
 		if (who_exited == citserver_pid) {
 			citserver_exit_code = WEXITSTATUS(status);
 			if ((WIFEXITED(status)) && (citserver_exit_code == 0)) {
-				fprintf(stderr, "ctdlvisor: citserver exited normally - ending AppImage session\n");
+				fprintf(stderr, "ctdlvisor: citserver exited normally - ending container session\n");
 				shutting_down = 1;
 				kill(webcit_pid, SIGTERM);
 				kill(webcits_pid, SIGTERM);
 			}
 			else if ((WIFEXITED(status)) && (citserver_exit_code >= 101) && (citserver_exit_code <= 109)) {
-				fprintf(stderr, "ctdlvisor: citserver exited intentionally - ending AppImage session\n");
+				fprintf(stderr, "ctdlvisor: citserver exited intentionally - ending container session\n");
 				shutting_down = 1;
 				kill(webcit_pid, SIGTERM);
 				kill(webcits_pid, SIGTERM);