From: Art Cancro Date: Tue, 19 Jan 2021 05:48:29 +0000 (+0000) Subject: More fine tuning of the AppImage X-Git-Tag: v939~164 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=9911be8b93584d582dc3aaeb3e24a9b0cbb544c0 More fine tuning of the AppImage --- diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh index 4391afc8d..f98e8ef21 100755 --- a/appimage/build_appimage.sh +++ b/appimage/build_appimage.sh @@ -26,9 +26,6 @@ make || exit 1 make install || exit 1 popd -# Build the appimage supervisor -cc ctdlvisor.c -o ctdlvisor || exit 1 - # Clear out our build directories rm -frv citadel.AppDir/usr mkdir -p citadel.AppDir/usr/bin @@ -51,6 +48,7 @@ do rsync -va /usr/local/$x/ ./citadel.AppDir/usr/local/$x/ done -cp ctdlvisor citadel.AppDir/usr/bin/ -ARCH=x86_64 appimagetool citadel.AppDir/ rm -fr /usr/local/citadel /usr/local/webcit + +cc ctdlvisor.c -o citadel.AppDir/usr/bin/ctdlvisor || exit 1 +ARCH=ARM appimagetool citadel.AppDir/ diff --git a/appimage/citadel.AppDir/AppRun b/appimage/citadel.AppDir/AppRun index bb068bf8e..0c0ececeb 100755 --- a/appimage/citadel.AppDir/AppRun +++ b/appimage/citadel.AppDir/AppRun @@ -2,4 +2,4 @@ export LD_LIBRARY_PATH=$APPDIR/usr/lib export PATH=$APPDIR/usr/bin -exec ctdlvisor +exec ctdlvisor $* diff --git a/appimage/ctdlvisor.c b/appimage/ctdlvisor.c index 5f088de4e..a3f52f5cb 100644 --- a/appimage/ctdlvisor.c +++ b/appimage/ctdlvisor.c @@ -21,15 +21,21 @@ #include #include #include +#include +#include +#include +char *data_directory = "/usr/local/citadel"; +char *http_port = "80"; +char *https_port = "443"; pid_t start_citadel() { char bin[1024]; sprintf(bin, "%s/usr/local/citadel/citserver", getenv("APPDIR")); pid_t pid = fork(); if (pid == 0) { - printf("Executing %s\n", bin); - execlp(bin, "citserver", "-x9", "-h/usr/local/citadel", NULL); + fprintf(stderr, "ctdlvisor: executing %s\n", bin); + execlp(bin, "citserver", "-x9", "-h", data_directory, NULL); perror("execlp"); exit(errno); } @@ -46,8 +52,8 @@ pid_t start_webcit() { sprintf(wchome, "-h%s/usr/local/webcit", getenv("APPDIR")); pid_t pid = fork(); if (pid == 0) { - printf("Executing %s\n", bin); - execlp(bin, "webcit", "-x9", wchome, "-p80", "uds", "/usr/local/citadel", NULL); + fprintf(stderr, "ctdlvisor: executing %s\n", bin); + execlp(bin, "webcit", "-x9", wchome, "-p", http_port, "uds", data_directory, NULL); perror("execlp"); exit(errno); } @@ -64,8 +70,8 @@ pid_t start_webcits() { sprintf(wchome, "-h%s/usr/local/webcit", getenv("APPDIR")); pid_t pid = fork(); if (pid == 0) { - printf("Executing %s\n", bin); - execlp(bin, "webcit", "-x9", wchome, "-s", "-p443", "uds", "/usr/local/citadel", NULL); + fprintf(stderr, "ctdlvisor: executing %s\n", bin); + execlp(bin, "webcit", "-x9", wchome, "-s", "-p", https_port, "uds", data_directory, NULL); perror("execlp"); exit(errno); } @@ -75,37 +81,74 @@ pid_t start_webcits() { } -main() { +int main(int argc, char **argv) { + pid_t citserver_pid; + pid_t webcit_pid; + pid_t webcits_pid; + int shutting_down = 0; int status; pid_t who_exited; + 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); + } - pid_t citserver_pid = start_citadel(); - pid_t webcit_pid = start_webcit(); - pid_t webcits_pid = start_webcits(); + 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); - do { - printf("LD_LIBRARY_PATH = %s\n", getenv("LD_LIBRARY_PATH")); - printf("PATH = %s\n", getenv("PATH")); - printf("APPDIR = %s\n", getenv("APPDIR")); + if (access(data_directory, R_OK|W_OK|X_OK)) { + fprintf(stderr, "ctdlvisor: %s: %s\n", data_directory, strerror(errno)); + exit(errno); + } - printf("waiting...\n"); + citserver_pid = start_citadel(); + webcit_pid = start_webcit(); + webcits_pid = start_webcits(); + + do { + fprintf(stderr, "ctdlvisor: waiting for any child process to exit...\n"); who_exited = waitpid(-1, &status, 0); - printf("pid=%d exited, status=%d\n", who_exited, status); + 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. + // If it crashes, however, we will start it back up. if (who_exited == citserver_pid) { if (WEXITSTATUS(status) == 0) { - printf("ctdlvisor: citserver exited normally - ending AppImage session\n"); - exit(0); + fprintf(stderr, "ctdlvisor: citserver exited normally - ending AppImage session\n"); + shutting_down = 1; + kill(webcit_pid, SIGTERM); + kill(webcits_pid, SIGTERM); + } + else { + citserver_pid = start_citadel(); } - citserver_pid = start_citadel(); } - if (who_exited == webcit_pid) webcit_pid = start_webcit(); - if (who_exited == webcits_pid) webcits_pid = start_webcits(); + // WebCit processes are restarted if they exit for any reason. + if ((who_exited == webcit_pid) && (!shutting_down)) webcit_pid = start_webcit(); + if ((who_exited == webcits_pid) && (!shutting_down)) webcits_pid = start_webcits(); - sleep(1); // slow down any accidental loops + // If we somehow end up in an endless loop, at least slow it down. + sleep(1); - } while (who_exited >= 0); + } while ((who_exited >= 0) && (shutting_down == 0)); printf("ctdlvisor: exiting.\n"); exit(0);