//
// Copyright (c) 2021 by the citadel.org team
//
-// 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.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
+// The program is distributed without any warranty, expressed or implied.
#include <stdlib.h>
#include <unistd.h>
what_exited = "unknown";
}
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);
- }
+ fprintf(stderr, "ctdlvisor: %d (%s) ended, status=%d\n", who_exited, what_exited, status);
}
} while (who_exited >= 0);
ctdlvisor_exit(0);
// 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();
}
}
}
+void install_client_link(void) {
+
+ FILE *fp;
+ char path_to_link[PATH_MAX];
+ snprintf(path_to_link, sizeof path_to_link, "%s/citadel", getenv("CTDL_DIR"));
+ fp = fopen(path_to_link, "w");
+ if (!fp) {
+ fprintf(stderr, "%s\n", strerror(errno));
+ return;
+ }
+
+ fprintf(fp, "#!/bin/bash\n"
+ "export APPDIR=%s\n"
+ "export LD_LIBRARY_PATH=${APPDIR}/usr/bin:$LD_LIBRARY_PATH\n"
+ "export PATH=${APPDIR}/usr/bin:$PATH\n"
+ "exec citadel\n"
+ ,
+ getenv("APPDIR")
+ );
+
+ fchmod(fileno(fp), 0755);
+ fclose(fp);
+}
+
+
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"));
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 -h %s", getenv("APPDIR"), getenv("CTDL_DIR"));
+ 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(); // start Citadel Server
+ webcit_pid = start_webcit(); // start WebCit HTTP
+ webcits_pid = start_webcits(); // start WebCit HTTPS
+
+ install_client_link();
+
+ main_loop();
+ }
- main_loop();
ctdlvisor_exit(0);
}
projects / citadel.git / blobdiff