X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/71b70599a2cd81c13cc4326499a5d0c45358cd7d..ad9bae0b85165ad96e35c202c96e4adb67786a90:/server/disorderd.c

diff --git a/server/disorderd.c b/server/disorderd.c
index ba18c23..15e3572 100644
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -38,11 +38,13 @@
 #include <sys/time.h>
 #include <pcre.h>
 #include <fcntl.h>
+#include <gcrypt.h>
 
 #include "daemonize.h"
 #include "event.h"
 #include "log.h"
 #include "configuration.h"
+#include "rights.h"
 #include "trackdb.h"
 #include "queue.h"
 #include "mem.h"
@@ -55,7 +57,6 @@
 #include "mixer.h"
 #include "eventlog.h"
 #include "printf.h"
-#include "setup.h"
 
 static ev_source *ev;
 
@@ -127,7 +128,7 @@ static int handle_sigterm(ev_source attribute((unused)) *ev_,
 static int rescan_again(ev_source *ev_,
 			const struct timeval attribute((unused)) *now,
 			void attribute((unused)) *u) {
-  trackdb_rescan(ev_);
+  trackdb_rescan(ev_, 1/*check*/);
   rescan_after(86400);
   return 0;
 }
@@ -238,6 +239,8 @@ int main(int argc, char **argv) {
   info("process ID %lu", (unsigned long)getpid());
   fix_path();
   srand(time(0));			/* don't start the same every time */
+  /* gcrypt initialization */
+  gcry_control(GCRYCTL_INIT_SECMEM, 1);
   /* create event loop */
   ev = ev_new();
   if(ev_child_setup(ev)) fatal(0, "ev_child_setup failed");
@@ -246,8 +249,6 @@ int main(int argc, char **argv) {
     fatal(0, "cannot read configuration");
   /* make sure the home directory exists and has suitable permissions */
   make_home();
-  /* create the default login */
-  make_root_login();
   /* Start the speaker process (as root! - so it can choose its nice value) */
   speaker_setup(ev);
   /* set server nice value _after_ starting the speaker, so that they
@@ -274,10 +275,14 @@ int main(int argc, char **argv) {
       fatal(errno, "error locking %s", lockfile);
   }
   /* initialize database environment */
-  trackdb_init(TRACKDB_NORMAL_RECOVER);
+  trackdb_init(TRACKDB_NORMAL_RECOVER|TRACKDB_MAY_CREATE);
   trackdb_master(ev);
-  /* install new config */
+  /* install new config (calls trackdb_open()) */
   reconfigure(ev, 0);
+  /* pull in old users */
+  trackdb_old_users();
+  /* create a root login */
+  trackdb_create_root();
   /* 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 */
@@ -285,13 +290,17 @@ int main(int argc, char **argv) {
   if(ev_signal(ev, SIGTERM, handle_sigterm, 0)) fatal(0, "ev_signal failed");
   /* ignore SIGPIPE */
   signal(SIGPIPE, SIG_IGN);
-  /* start a rescan straight away if this is a new installation */
+  /* Start a rescan straight away if this is a new installation.  This rescan
+   * blocks; the point is that when it is finished we are in a good position to
+   * choose a random track. */
   if(!trackdb_existing_database) {
-    trackdb_rescan(0/*ev*/);
+    trackdb_rescan(0/*ev*/, 0/*check*/);
     /* No ev -> the rescan will block.  Since we called reconfigure() already
      * any clients will also be forced to block. */
   }
-  rescan_after(86400);
+  /* Start a second rescan, with length checking enabled, immediately after
+   * startup. */
+  rescan_after(1);
   /* periodically tidy up the database */
   dbgc_after(60);
   /* periodically check the volume */