Fix verbose builds: Reset thread ID _after_ flush_thread completes (#7152)

Author: eddyashton

src/enclave/main.cpp

@@ -177,13 +177,6 @@ extern "C"
 
     e.store(enclave);
 
-    // Reset the thread ID generator. This function will exit before any
-    // thread calls enclave_run, and without creating any new threads, so it
-    // is safe for the first thread that calls enclave_run to re-use this
-    // thread_id. That way they are both considered MAIN_THREAD_ID, even if
-    // they are actually distinct std::threads.
-    ccf::threading::reset_thread_id_generator();
-
     return CreateNodeStatus::OK;
   }
 

src/host/run.cpp

@@ -916,6 +916,13 @@ namespace ccf
       ecall_completed.store(true);
       flusher_thread.join();
 
+      // Reset the thread ID generator. This function will exit before any
+      // thread calls enclave_run, and without creating any new threads, so it
+      // is safe for the first thread that calls enclave_run to re-use this
+      // thread_id. That way they are both considered MAIN_THREAD_ID, even if
+      // they are actually distinct std::threads.
+      ccf::threading::reset_thread_id_generator();
+
       if (create_status != CreateNodeStatus::OK)
       {
         LOG_FAIL_FMT(