X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=appimage%2Fctdlvisor.c;h=405a56bdaed68426601981707e640e7a29613387;hb=5b4f25945be356aa3a8797e70bbe16355538a967;hp=a7ae77677f9f01791c4768d897efea5c189fa3c1;hpb=5584de4d18c11044d91a292d751fc83c642d3dc7;p=citadel.git diff --git a/appimage/ctdlvisor.c b/appimage/ctdlvisor.c index a7ae77677..405a56bda 100644 --- a/appimage/ctdlvisor.c +++ b/appimage/ctdlvisor.c @@ -24,26 +24,40 @@ #include #include #include +#include +#include -void main_loop(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; +int shutting_down = 0; + +// Call this instead of exit() just for common diagnostics etc. +void ctdlvisor_exit(int code) { + printf("ctdlvisor: exit code %d\n", code); + exit(code); +} +// Interrupting this program with a signal will begin an orderly shutdown. void signal_handler(int signal) { - fprintf(stderr, "ctdlvisor: caught signal %d", 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"; @@ -57,26 +71,50 @@ void signal_handler(int signal) { else { what_exited = "unknown"; } - fprintf(stderr, "ctdlvisor: pid=%d (%s) exited, status=%d, exitcode=%d\n", who_exited, what_exited, status, WEXITSTATUS(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); - - 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(); // become our own process group leader + 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); - execlp(bin, "citserver", "-x9", "-h", data_directory, NULL); + 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); } } @@ -90,11 +128,12 @@ 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); + detach_from_tty(); + execlp(bin, "webcit", "-x9", wchome, "-p", getenv("HTTP_PORT"), "uds", getenv("CTDL_DIR"), NULL); exit(errno); } else { + fprintf(stderr, "ctdlvisor: webcit (HTTP) running on pid=%d\n", pid); return(pid); } } @@ -108,68 +147,40 @@ 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); + detach_from_tty(); + execlp(bin, "webcit", "-x9", wchome, "-s", "-p", getenv("HTTPS_PORT"), "uds", getenv("CTDL_DIR"), NULL); exit(errno); } else { + fprintf(stderr, "ctdlvisor: webcit (HTTPS) running on pid=%d\n", pid); return(pid); } } -int main(int argc, char **argv) { - int c; - - while ((c = getopt (argc, argv, "h:p:s:")) != -1) switch(c) { - case 'h': - data_directory = optarg; - break; - case 'p': - http_port = optarg; - break; - case 's': - https_port = optarg; - break; - default: - fprintf(stderr, "ctdlvisor: usage: ctdlvisor [-h data_directory] [-p http_port] [-s https_port]\n"); - exit(1); +void test_binary_compatibility(void) { + char cmd[1024]; + int ret; + fprintf(stderr, "ctdlvisor: testing compatibility...\n"); + sprintf(cmd, "%s/usr/local/citadel/citserver -c", getenv("APPDIR")); + ret = system(cmd); + if (ret) { + fprintf(stderr, "ctdlvisor: this appimage cannot run on your system.\n" + " The reason may be indicated by any error messages appearing above.\n"); } - - 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")); - fprintf(stderr, "ctdlvisor: APPDIR = %s\n", getenv("APPDIR")); - fprintf(stderr, "ctdlvisor: data directory = %s\n", data_directory); - fprintf(stderr, "ctdlvisor: HTTP port = %s\n", http_port); - fprintf(stderr, "ctdlvisor: HTTPS port = %s\n", https_port); - - if (access(data_directory, R_OK|W_OK|X_OK)) { - fprintf(stderr, "ctdlvisor: %s: %s\n", data_directory, strerror(errno)); - exit(errno); + else { + fprintf(stderr, "ctdlvisor: this appimage appears to be compatible with your system.\n"); } - - 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(); + exit(ret); } 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); fprintf(stderr, "ctdlvisor: pid=%d exited, status=%d, exitcode=%d\n", who_exited, status, WEXITSTATUS(status)); @@ -202,7 +213,39 @@ void main_loop(void) { sleep(1); } while (who_exited >= 0); + ctdlvisor_exit(citserver_exit_code); +} + + +int main(int argc, char **argv) { + + if (getenv("APPDIR") == NULL) { + fprintf(stderr, "ctdlvisor: APPDIR is not set. This program must be run from within an AppImage.\n"); + ctdlvisor_exit(1); + } + + 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")); + fprintf(stderr, "ctdlvisor: APPDIR = %s\n", getenv("APPDIR")); + fprintf(stderr, "ctdlvisor: data directory = %s\n", getenv("CTDL_DIR")); + fprintf(stderr, "ctdlvisor: HTTP port = %s\n", getenv("HTTP_PORT")); + fprintf(stderr, "ctdlvisor: HTTPS port = %s\n", getenv("HTTPS_PORT")); + + if (access(getenv("CTDL_DIR"), R_OK|W_OK|X_OK)) { + fprintf(stderr, "ctdlvisor: %s: %s\n", getenv("CTDL_DIR"), strerror(errno)); + ctdlvisor_exit(errno); + } - printf("ctdlvisor: exit code %d\n", citserver_exit_code); - exit(citserver_exit_code); + 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(); + ctdlvisor_exit(0); }