3 files changed, 34 insertions, 11 deletions

diff --git a/src/ot_accesslist.c b/src/ot_accesslist.c
index ea5bdba..0597e9a 100644
--- a/src/ot_accesslist.c
+++ b/src/ot_accesslist.c
@@ -33,7 +33,7 @@ const char *g_accesslist_filename = NULL;
 const char *g_accesslist_pipe_add    = NULL;
 const char *g_accesslist_pipe_delete = NULL;
 #endif
-static pthread_mutex_t g_accesslist_mutex;
+static pthread_mutex_t g_accesslist_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /* Accesslists are lock free linked lists. We can not make them locking, because every announce
    would try to acquire the mutex, making it the most contested mutex in the whole of opentracker,
@@ -257,15 +257,14 @@ static void *accesslist_worker(void *args) {
   (void)args;
 
   while (1) {
+    /* Wait for signals */
+    while (sigwait(&signal_mask, &sig) != 0)
+      ;
+
     if (!g_opentracker_running)
       return NULL;
 
-    /* Initial attempt to read accesslist */
     accesslist_readfile();
-
-    /* Wait for signals */
-    while (sigwait(&signal_mask, &sig) != 0 && sig != SIGHUP)
-      ;
   }
   return NULL;
 }
@@ -405,7 +404,9 @@ static void accesslist_stop_fifo_worker(pthread_t thread, _Atomic int *left, con
 
 static pthread_t thread_id;
 void accesslist_init(void) {
-  pthread_mutex_init(&g_accesslist_mutex, NULL);
+  /* Everything that consults the list starts after this returns */
+  accesslist_readfile();
+
   pthread_create(&thread_id, NULL, accesslist_worker, NULL);
 #ifdef WANT_DYNAMIC_ACCESSLIST
   if (g_accesslist_pipe_add)
@@ -436,7 +437,6 @@ void accesslist_deinit(void) {
 #endif
 
   pthread_mutex_unlock(&g_accesslist_mutex);
-  pthread_mutex_destroy(&g_accesslist_mutex);
 }
 
 void accesslist_cleanup(void) {
diff --git a/src/ot_accesslist.h b/src/ot_accesslist.h
index 68c88dc..c0f3fc2 100644
--- a/src/ot_accesslist.h
+++ b/src/ot_accesslist.h
@@ -12,8 +12,9 @@
 
 #if defined(WANT_ACCESSLIST_BLACK) || defined(WANT_ACCESSLIST_WHITE)
 #define WANT_ACCESSLIST
-/* Starts a thread that rereads the list when sent SIGHUP, and is stopped by
-   being sent one, so the caller blocks SIGHUP process wide beforehand */
+/* Reads the list, then starts a thread that rereads it when sent SIGHUP and
+   is stopped by being sent one, so the caller blocks SIGHUP process wide
+   beforehand */
 void         accesslist_init(void);
 void         accesslist_deinit(void);
 int          accesslist_hashisvalid(const ot_hash hash);
diff --git a/tests/integration/test_accesslist.py b/tests/integration/test_accesslist.py
index 41ff654..1c84ccf 100644
--- a/tests/integration/test_accesslist.py
+++ b/tests/integration/test_accesslist.py
@@ -5,10 +5,11 @@ entry, and the file parser has to cope with the shapes an operator actually
 produces: an empty file, and a last line with no newline after it.
 """
 
+import os
 import struct
 import unittest
 
-from harness import TrackerTestCase
+from harness import Tracker, TrackerTestCase
 
 BLOCKED = b"\xb1" * 20
 ALLOWED = b"\xa1" * 20
@@ -96,5 +97,26 @@ class MissingBlacklist(TrackerTestCase):
         self.assertEqual(self.tracker.announce(BLOCKED, port=6881, left=0)[b"complete"], 1)
 
 
+class ListIsInPlaceBeforeTheStateFile(TrackerTestCase):
+    """The loader used to run in a thread of its own, so a state file read at
+    startup was checked against a list that was still empty."""
+
+    config = "access.blacklist {dir}/blacklist\n"
+    files = {"blacklist": listing(BLOCKED)}
+
+    def test_a_blacklisted_torrent_in_a_state_file_is_not_restored(self):
+        path = os.path.join(self.tracker.dir, "state")
+        with open(path, "w") as handle:
+            handle.write("%s:5:7\n%s:5:7\n" % (BLOCKED.hex(), ALLOWED.hex()))
+
+        restarted = Tracker(self.config, self.files, extra_args=["-l", path])
+        try:
+            self.assertNotIn(BLOCKED, restarted.scrape(BLOCKED)[b"files"], "the blacklist was not in place when the state file was read")
+            self.assertIn(ALLOWED, restarted.scrape(ALLOWED)[b"files"], "the state file was not read at all")
+            restarted.stop()
+        finally:
+            restarted._cleanup()
+
+
 if __name__ == "__main__":
     unittest.main()