projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d424d04
)
Server restart via command no longer requires running as a daemon , uses execv()...
author
Art Cancro
<ajc@citadel.org>
Tue, 13 Aug 2019 20:27:13 +0000
(16:27 -0400)
committer
Art Cancro
<ajc@citadel.org>
Tue, 13 Aug 2019 20:27:13 +0000
(16:27 -0400)
citadel/modules/ctdlproto/serv_syscmds.c
patch
|
blob
|
history
diff --git
a/citadel/modules/ctdlproto/serv_syscmds.c
b/citadel/modules/ctdlproto/serv_syscmds.c
index 7341ad238c0e6dc82225b18f56358b3a7fa26f60..8783cc291d55ace6ae2300fce9a42766e81dfe1d 100644
(file)
--- a/
citadel/modules/ctdlproto/serv_syscmds.c
+++ b/
citadel/modules/ctdlproto/serv_syscmds.c
@@
-33,20
+33,12
@@
void cmd_down(char *argbuf) {
int state = CIT_OK;
restart_server = extract_int(argbuf, 0);
int state = CIT_OK;
restart_server = extract_int(argbuf, 0);
- if (restart_server > 0)
- {
+ if (restart_server > 0) {
Reply = "%d citserver will now shut down and automatically restart.\n";
}
Reply = "%d citserver will now shut down and automatically restart.\n";
}
- if ((restart_server > 0) && !running_as_daemon)
- {
- syslog(LOG_ERR, "The user requested restart, but not running as daemon! Geronimooooooo!\n");
- Reply = "%d Warning: citserver is not running in daemon mode and is therefore unlikely to restart automatically.\n";
- state = ERROR;
- }
cprintf(Reply, state);
}
cprintf(Reply, state);
}
- else
- {
+ else {
cprintf(Reply, CIT_OK + SERVER_SHUTTING_DOWN);
}
CC->kill_me = KILLME_SERVER_SHUTTING_DOWN;
cprintf(Reply, CIT_OK + SERVER_SHUTTING_DOWN);
}
CC->kill_me = KILLME_SERVER_SHUTTING_DOWN;