X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=appimage%2Fctdlvisor.c;h=405a56bdaed68426601981707e640e7a29613387;hb=5b4f25945be356aa3a8797e70bbe16355538a967;hp=cedc2a4c49d2c285d5560e82f4014b38b5613d04;hpb=55ccbdf1cbb55d5c190072dbba32394fcf171d60;p=citadel.git diff --git a/appimage/ctdlvisor.c b/appimage/ctdlvisor.c index cedc2a4c4..405a56bda 100644 --- a/appimage/ctdlvisor.c +++ b/appimage/ctdlvisor.c @@ -27,9 +27,6 @@ #include #include -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; @@ -74,9 +71,18 @@ 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); - ctdlvisor_exit(0); } @@ -102,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", data_directory, NULL); + execlp(bin, "citserver", "-x9", "-h", getenv("CTDL_DIR"), NULL); exit(errno); } else { + fprintf(stderr, "ctdlvisor: citserver running on pid=%d\n", pid); return(pid); } } @@ -122,10 +129,11 @@ pid_t start_webcit() { if (pid == 0) { fprintf(stderr, "ctdlvisor: executing %s\n", bin); detach_from_tty(); - execlp(bin, "webcit", "-x9", wchome, "-p", http_port, "uds", data_directory, NULL); + 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); } } @@ -140,22 +148,39 @@ pid_t start_webcits() { if (pid == 0) { fprintf(stderr, "ctdlvisor: executing %s\n", bin); detach_from_tty(); - execlp(bin, "webcit", "-x9", wchome, "-s", "-p", https_port, "uds", data_directory, NULL); + 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); } } +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)); @@ -192,17 +217,23 @@ void main_loop(void) { } -void run_in_foreground(void) { +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", data_directory); - fprintf(stderr, "ctdlvisor: HTTP port = %s\n", http_port); - fprintf(stderr, "ctdlvisor: HTTPS port = %s\n", https_port); + 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(data_directory, R_OK|W_OK|X_OK)) { - fprintf(stderr, "ctdlvisor: %s: %s\n", data_directory, strerror(errno)); + 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); } @@ -218,111 +249,3 @@ void run_in_foreground(void) { main_loop(); ctdlvisor_exit(0); } - - -void install_as_service(void) { - - // FIXME fail if some other citadel distribution is already there - // FIXME fail if any server processes are running - // FIXME interact with the user - // FIXME get port numbers and data directory - // FIXME create the data directory - // FIXME move the appimage into its permanent location - - fprintf(stderr, "Installing as service\n"); - - FILE *fp = fopen("/etc/systemd/system/ctdl.service", "w"); - fprintf(fp, "# This unit file starts all Citadel services via the AppImage distribution.\n" - "[Unit]\n" - "Description=Citadel\n" - "After=network.target\n" - "[Service]\n" - "ExecStart=/root/citadel/appimage/Citadel-x86_64.AppImage run -h %s -s %s -s %s\n" - "ExecStop=/bin/kill $MAINPID\n" - "KillMode=process\n" - "Restart=on-failure\n" - "LimitCORE=infinity\n" - "[Install]\n" - "WantedBy=multi-user.target\n" - , - data_directory, http_port, https_port - ); - fclose(fp); - - fprintf(stderr, "systemd unit file is installed. Type 'systemctl enable ctdl' to have it start at boot.\n"); -} - - -static char *usage = - "\n" - "ctdlvisor: usage: ctdlvisor [-h data_directory] [-p http_port] [-s https_port] command\n" - " 'command' must be one of: run, install, remove, upgrade, test, help\n" - "\n" -; - -int main(int argc, char **argv) { - int c; - - if (getenv("APPDIR") == NULL) { - fprintf(stderr, "ctdlvisor: APPDIR is not set. This program must be run from within an AppImage.\n"); - ctdlvisor_exit(1); - } - - 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, "%s", usage); - ctdlvisor_exit(1); - } - - - if (argc != optind+1) { - fprintf(stderr, "%s", usage); - ctdlvisor_exit(1); - } - - if (!strcasecmp(argv[optind], "run")) { - run_in_foreground(); - } - else if (!strcasecmp(argv[optind], "install")) { - install_as_service(); - } - else if (!strcasecmp(argv[optind], "remove")) { - fprintf(stderr, "oops, this is not implemented yet\n"); - } - else if (!strcasecmp(argv[optind], "upgrade")) { - fprintf(stderr, "oops, this is not implemented yet\n"); - } - else if (!strcasecmp(argv[optind], "test")) { - fprintf(stderr, "oops, this is not implemented yet\n"); - } - else if (!strcasecmp(argv[optind], "help")) { - fprintf(stderr, "%s", usage); - fprintf(stderr, "[-h dir] Use 'dir' as the Citadel data directory (this directory must exist)\n" - "[-p port] Listen for HTTP connections on 'port'\n" - "[-s port] Listen for HTTPS connections on 'port'\n" - "'command' must be one of:\n" - " run - launch Citadel services (does not detach from terminal)\n" - " install - create systemd unit files for automatic startup at boot\n" - " remove - delete systemd unit files to end automatic startup\n" - " upgrade - download and install a new version of this appimage\n" - " test - test the appimage for binary compatibility with this host\n" - " help - display this message\n" - "\n" - ); - } - else { - fprintf(stderr, "%s", usage); - ctdlvisor_exit(1); - } - - ctdlvisor_exit(0); -}