X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=appimage%2Fctdlvisor.c;h=6784f2cc5d042998ca55eb2f8068dcbca87be656;hb=fe70bc8314205d9c32da7c73e5bf1c58ee1a67f6;hp=d08b63607381c1d90bf53829629cec54f02395ee;hpb=a69148ba680b403a3f07310e037210de606c4a51;p=citadel.git diff --git a/appimage/ctdlvisor.c b/appimage/ctdlvisor.c index d08b63607..6784f2cc5 100644 --- a/appimage/ctdlvisor.c +++ b/appimage/ctdlvisor.c @@ -1,4 +1,3 @@ -// // This is a supervisor program that handles start/stop/restart of // the various Citadel System components, when we are running on // an AppImage instance. @@ -8,7 +7,7 @@ // This program is open source software. It runs great on the // Linux operating system (and probably elsewhere). You can use, // copy, and run it under the terms of the GNU General Public -// License version 3. Richard Stallman is an asshole communist. +// License version 3. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -71,9 +70,10 @@ 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) { + fprintf(stderr, "ctdlvisor: %d (%s) ended, status=%d\n", who_exited, what_exited, status); + } } while (who_exited >= 0); - ctdlvisor_exit(0); } @@ -99,12 +99,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); } } @@ -123,6 +124,7 @@ pid_t start_webcit() { exit(errno); } else { + fprintf(stderr, "ctdlvisor: webcit (HTTP) running on pid=%d\n", pid); return(pid); } } @@ -141,35 +143,18 @@ pid_t start_webcits() { exit(errno); } else { + fprintf(stderr, "ctdlvisor: webcit (HTTPS) running on pid=%d\n", pid); return(pid); } } -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"); - } - else { - fprintf(stderr, "ctdlvisor: this appimage appears to be compatible with your system.\n"); - } - exit(ret); -} - - void main_loop(void) { int status; pid_t who_exited; 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)); @@ -177,19 +162,22 @@ void main_loop(void) { // If it crashes, however, we will start it back up. if (who_exited == citserver_pid) { citserver_exit_code = WEXITSTATUS(status); - if (citserver_exit_code == 0) { + if ((WIFEXITED(status)) && (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)) { + else if ((WIFEXITED(status)) && (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 { + if (WIFSIGNALED(status)) { + fprintf(stderr, "ctdlvisor: citserver crashed on signal %d\n", WTERMSIG(status)); + } citserver_pid = start_citadel(); } } @@ -207,12 +195,34 @@ void main_loop(void) { int main(int argc, char **argv) { + int a; + int migrate_mode = 0; if (getenv("APPDIR") == NULL) { fprintf(stderr, "ctdlvisor: APPDIR is not set. This program must be run from within an AppImage.\n"); ctdlvisor_exit(1); } + /* parse command-line arguments */ + while ((a=getopt(argc, argv, "cm")) != EOF) switch(a) { + + // test this binary for compatibility and exit + case 'c': + fprintf(stderr, "%s: binary compatibility confirmed\n", argv[0]); + exit(0); + break; + + // run ctdlmigrate only + case 'm': + migrate_mode = 1; + break; + + // any other parameter makes it crash and burn + default: + fprintf(stderr, "usage\n"); + 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")); @@ -226,15 +236,31 @@ int main(int argc, char **argv) { ctdlvisor_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(); + // "migrate mode" means we just start the server and then run ctdlmigrate interactively. + if (migrate_mode) { + citserver_pid = start_citadel(); + fprintf(stderr, "ctdlvisor: waiting a moment for citserver to initialize...\n"); + sleep(5); + char bin[1024]; + sprintf(bin, "%s/usr/local/citadel/ctdlmigrate", getenv("APPDIR")); + system(bin); + kill(citserver_pid, SIGTERM); + } + + // Otherwise, it's just a normal happy day in Citadel land. + else { + signal(SIGTERM, signal_handler); + signal(SIGINT, signal_handler); + signal(SIGQUIT, signal_handler); + + citserver_pid = start_citadel(); + webcit_pid = start_webcit(); + webcits_pid = start_webcits(); + + main_loop(); + } - main_loop(); ctdlvisor_exit(0); }