#include "control.h"
#include "tools.h"
#include "euidindex.h"
-#include "serv_network.h"
+#include "serv_network.h" /* Needed for destroy_network_queue_room called from master_cleanup */
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
*/
void master_cleanup(int exitcode) {
struct CleanupFunctionHook *fcn;
+ struct MaintenanceThreadHook *m_fcn;
static int already_cleaning_up = 0;
if (already_cleaning_up) while(1) sleep(1);
/* Close the AdjRefCount queue file */
AdjRefCount(-1, 0);
- /* Shut down the indexer thread */
- lprintf(CTDL_INFO, "Waiting for the indexer thread to shut down\n");
- pthread_join(indexer_thread_tid, NULL);
-
- /* Shut down the checkpoint thread */
- lprintf(CTDL_INFO, "Waiting for the checkpoint thread to shut down\n");
- pthread_join(checkpoint_thread_tid, NULL);
+ for (m_fcn = MaintenanceThreadHookTable; m_fcn != NULL; m_fcn = m_fcn->next) {
+ lprintf(CTDL_INFO, "Waiting for maintenance thread \"%s\" to shut down\n", m_fcn->name);
+ pthread_join(m_fcn->MaintenanceThread_tid, NULL);
+ }
+
/* Close databases */
lprintf(CTDL_INFO, "Closing databases\n");
lprintf(CTDL_NOTICE, "citserver: Exiting with status %d\n", exitcode);
fflush(stdout); fflush(stderr);
+ if (restart_server != 0)
+ exit(1);
exit(exitcode);
}
fp = fopen(public_clients_file, "r");
if (fp != NULL) while (fgets(buf, sizeof buf, fp)!=NULL) {
- for (i=0; i<strlen(buf); ++i) {
+ char *ptr;
+ ptr = buf;
+ while (!IsEmptyStr(*ptr)) {
if (buf[i] == '#') buf[i] = 0;
+ else ptr++;
}
while (isspace((buf[strlen(buf)-1]))) {
buf[strlen(buf)-1] = 0;
safestrncpy(CC->cs_clientname, desc, sizeof CC->cs_clientname);
CC->cs_clientname[31] = 0;
- if (strlen(from_host) > 0) {
+ if (!IsEmptyStr(from_host)) {
if (CC->is_local_socket) do_lookup = 1;
else if (is_public_client()) do_lookup = 1;
}
/* Otherwise, look for the requested file by name. */
else {
mesg_locate(targ, sizeof targ, buf2, 2, (const char **)dirs);
- if (strlen(targ) == 0) {
+ if (IsEmptyStr(targ)) {
snprintf(buf2, sizeof buf2, "%s.%d",
buf, CC->cs_clientdev);
mesg_locate(targ, sizeof targ, buf2, 2,
(const char **)dirs);
- if (strlen(targ) == 0) {
+ if (IsEmptyStr(targ)) {
mesg_locate(targ, sizeof targ, buf, 2,
(const char **)dirs);
}
free(dirs[0]);
free(dirs[1]);
- if (strlen(targ)==0) {
+ if (IsEmptyStr(targ)) {
cprintf("%d '%s' not found. (Searching in %s and %s)\n",
ERROR + FILE_NOT_FOUND,
mname,
if (CtdlAccessCheck(ac_aide)) return;
extract_token(buf, mname, 0, '|', sizeof buf);
- for (a=0; a<strlen(buf); ++a) { /* security measure */
+ for (a=0; !IsEmptyStr(&buf[a]); ++a) { /* security measure */
if (buf[a] == '/') buf[a] = '.';
}
free(dirs[0]);
free(dirs[1]);
- if (strlen(targ)==0) {
+ if (IsEmptyStr(targ)) {
snprintf(targ, sizeof targ,
"%s/%s",
ctdl_hlp_dir, buf);
/*
* Shut down the server
*/
-void cmd_down(void) {
+void cmd_down(char *argbuf) {
+ char *Reply ="%d Shutting down server. Goodbye.\n";
if (CtdlAccessCheck(ac_aide)) return;
- cprintf("%d Shutting down server. Goodbye.\n", CIT_OK);
+ if (!IsEmptyStr(argbuf))
+ {
+ int state = CIT_OK;
+ restart_server = extract_int(argbuf, 0);
+
+ if (restart_server > 0)
+ Reply = "%d Restarting server. See you soon.\n";
+ if ((restart_server > 0) && !running_as_daemon)
+ {
+ lprintf(CTDL_ERR, "The user requested restart, but not running as deamon! Geronimooooooo!\n");
+ Reply = "%d Warning, not running in deamon mode. maybe we will come up again, but don't lean on it.\n";
+ state = ERROR;
+ }
+ cprintf(Reply, state);
+ }
+ else
+ {
+ cprintf(Reply, CIT_OK);
+ }
time_to_die = 1;
}
void cmd_scdn(char *argbuf)
{
int new_state;
+ int state = CIT_OK;
+ char *Reply = "%d %d\n";
if (CtdlAccessCheck(ac_aide)) return;
new_state = extract_int(argbuf, 0);
+ if ((new_state == 2) || (new_state == 3))
+ {
+ restart_server = 1;
+ if (!running_as_daemon)
+ {
+ lprintf(CTDL_ERR, "The user requested restart, but not running as deamon! Geronimooooooo!\n");
+ Reply = "%d %d Warning, not running in deamon mode. maybe we will come up again, but don't lean on it.\n";
+ state = ERROR;
+ }
+
+ restart_server = extract_int(argbuf, 0);
+ new_state -= 2;
+ }
if ((new_state == 0) || (new_state == 1)) {
ScheduledShutdown = new_state;
}
- cprintf("%d %d\n", CIT_OK, ScheduledShutdown);
+ cprintf(Reply, state, ScheduledShutdown);
}
}
else if (!strncasecmp(cmdbuf,"DOWN",4)) {
- cmd_down();
+ cmd_down(&cmdbuf[5]);
}
else if (!strncasecmp(cmdbuf,"HALT",4)) {