X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/0759c0706f86a5943f110382731ac808c04ed689..784744a808c4620e2c1eec59fc3baf147fe8710e:/server/disorderd.c

diff --git a/server/disorderd.c b/server/disorderd.c
index 2203739..31b70a4 100644
--- 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");
-  reconfigure(ev, 1);
+  reconfigure(ev, RECONFIGURE_RELOADING);
   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);
-  /* 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);
@@ -276,6 +276,10 @@ int main(int argc, char **argv) {
   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 */
   if(ev_signal(ev, SIGHUP, handle_sighup, 0)) fatal(0, "ev_signal failed");
   /* exit on SIGINT/SIGTERM */