chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't create socket until database is in a sensible state. Should
[disorder]
/
server
/
disorderd.c
diff --git
a/server/disorderd.c
b/server/disorderd.c
index a4af66b1a2fa5a6cc1026e5d61b1fd1001026e40..31b70a4e917de00b7e3effa96a2fa61349baaa02 100644
(file)
--- a/
server/disorderd.c
+++ b/
server/disorderd.c
@@
-58,7
+58,7
@@
static int handle_sighup(ev_source attribute((unused)) *ev_,
int attribute((unused)) sig,
void attribute((unused)) *u) {
info("received SIGHUP");
int attribute((unused)) sig,
void attribute((unused)) *u) {
info("received SIGHUP");
- reconfigure(ev,
1
);
+ reconfigure(ev,
RECONFIGURE_RELOADING
);
return 0;
}
return 0;
}
@@
-262,8
+262,8
@@
int main(int argc, char **argv) {
/* initialize database environment */
trackdb_init(TRACKDB_NORMAL_RECOVER|TRACKDB_MAY_CREATE);
trackdb_master(ev);
/* initialize database environment */
trackdb_init(TRACKDB_NORMAL_RECOVER|TRACKDB_MAY_CREATE);
trackdb_master(ev);
- /* install new config
(calls trackdb_open())
*/
- if(reconfigure(ev,
0
))
+ /* install new config
; don't create socket
*/
+ if(reconfigure(ev,
RECONFIGURE_FIRST
))
fatal(0, "failed to read configuration");
/* Open the database */
trackdb_open(TRACKDB_CAN_UPGRADE);
fatal(0, "failed to read configuration");
/* Open the database */
trackdb_open(TRACKDB_CAN_UPGRADE);
@@
-276,6
+276,8
@@
int main(int argc, char **argv) {
trackdb_old_users();
/* create a root login */
trackdb_create_root();
trackdb_old_users();
/* create a root login */
trackdb_create_root();
+ /* create sockets */
+ reset_sockets(ev);
/* check for change to database parameters */
dbparams_check();
/* re-read config if we receive a SIGHUP */
/* check for change to database parameters */
dbparams_check();
/* re-read config if we receive a SIGHUP */