X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/02ba7921a8b083f421a747b89c65a87d0afd5841..b4a8d0ffa9ecf46a806be320e52362bc96c66a8b:/server/disorderd.c

diff --git a/server/disorderd.c b/server/disorderd.c
index ab6221a..2203739 100644
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -244,7 +244,7 @@ int main(int argc, char **argv) {
   /* make sure we're not root, whatever the config says */
   if(getuid() == 0 || geteuid() == 0) fatal(0, "do not run as root");
   /* open a lockfile - we only want one copy of the server to run at once. */
-  if(config->lock) {
+  if(1) {
     const char *lockfile;
     int lockfd;
     struct flock lock;
@@ -263,7 +263,15 @@ int main(int argc, char **argv) {
   trackdb_init(TRACKDB_NORMAL_RECOVER|TRACKDB_MAY_CREATE);
   trackdb_master(ev);
   /* install new config (calls trackdb_open()) */
-  reconfigure(ev, 0);
+  if(reconfigure(ev, 0))
+    fatal(0, "failed to read configuration");
+  /* Open the database */
+  trackdb_open(TRACKDB_CAN_UPGRADE);
+  /* load the queue and recently-played list */
+  queue_read();
+  recent_read();
+  /* Arrange timeouts for schedule actions */
+  schedule_init(ev);
   /* pull in old users */
   trackdb_old_users();
   /* create a root login */