3 files changed, 3 insertions, 4 deletions

diff --git a/src/opentracker.c b/src/opentracker.c
index f0841ff..65fe382 100644
--- a/src/opentracker.c
+++ b/src/opentracker.c
@@ -426,11 +426,14 @@ int main(int argc, char **argv) {
   if (g_statefile)
     load_state(g_statefile);
 
+  /* Nothing that adds a peer runs before the state file has been read */
+  livesync_init();
   listen_start_tcp_workers();
   listen_start_udp_workers();
 
   server_mainloop(0);
   worker_stop_all();
+  livesync_deinit();
 
   /* No thread is serving any more, so the teardown can run where a debugger
      and the sanitizers can follow it */
diff --git a/src/trackerlogic.c b/src/trackerlogic.c
index dac0e0f..d25ddac 100644
--- a/src/trackerlogic.c
+++ b/src/trackerlogic.c
@@ -569,7 +569,6 @@ void trackerlogic_init(void) {
   clean_init();
   fullscrape_init();
   accesslist_init();
-  livesync_init();
   stats_init();
 }
 
@@ -610,7 +609,6 @@ void trackerlogic_deinit(void) {
 
   clean_deinit();
   stats_deinit();
-  livesync_deinit();
   accesslist_deinit();
   fullscrape_deinit();
 
diff --git a/tests/stubs.c b/tests/stubs.c
index fd47a68..b8ab174 100644
--- a/tests/stubs.c
+++ b/tests/stubs.c
@@ -31,8 +31,6 @@ long io_trywrite(long d, const char *buf, long len) {
 void fullscrape_init(void) {}
 void fullscrape_deinit(void) {}
 void stats_cleanup(void) {}
-void livesync_init(void) {}
-void livesync_deinit(void) {}
 void livesync_tell(struct ot_workstruct *ws) { (void)ws; }
 void stats_init(void) {}
 void stats_deinit(void) {}