The initial rescan now blocks any client connections. This means that

[disorder] / server / disorderd.c

diff --git a/server/disorderd.c b/server/disorderd.c
index e8e1046067bc1d9fc831e7cbd31220e13e1d4f8a..758907cbd0ac4370fe99ad9e6729191ded725f43 100644 (file)
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -289,8 +289,11 @@ int main(int argc, char **argv) {
   /* ignore SIGPIPE */
   signal(SIGPIPE, SIG_IGN);
   /* start a rescan straight away */
-  if(initial_rescan)
-    trackdb_rescan(ev);
+  if(initial_rescan) {
+    trackdb_rescan(0/*ev*/);
+    /* No ev -> the rescan will block.  Since we called reconfigure() already
+     * any clients will also be forced to block. */
+  }
   rescan_after(86400);
   /* periodically tidy up the database */
   dbgc_after(60);