Merge branch 'develop' into coretk-enhance/disable-runtime-editing-custom-service-config

daemon/core/api/grpc/client.py

@@ -146,8 +146,9 @@ def start_streamer(stream: Any, handler: Callable[[core_pb2.Event], None]) -> No
     :param handler: function that handles an event
     :return: nothing
     """
-    thread = threading.Thread(target=stream_listener, args=(stream, handler))
-    thread.daemon = True
+    thread = threading.Thread(
+        target=stream_listener, args=(stream, handler), daemon=True
+    )
     thread.start()
 
 

daemon/core/api/tlv/corehandlers.py

@@ -949,11 +949,10 @@ class CoreHandler(socketserver.BaseRequestHandler):
                             file_name,
                             {"__file__": file_name, "coreemu": self.coreemu},
                         ),
+                        daemon=True,
                     )
-                    thread.daemon = True
                     thread.start()
-                    # allow time for session creation
-                    time.sleep(0.25)
+                    thread.join()
 
                 if message.flags & MessageFlags.STRING.value:
                     new_session_ids = set(self.coreemu.sessions.keys())
@@ -1128,7 +1127,6 @@ class CoreHandler(socketserver.BaseRequestHandler):
                     self.session.location.refgeo,
                     self.session.location.refscale,
                 )
-                logging.info("location configured: UTM%s", self.session.location.refutm)
 
     def handle_config_metadata(self, message_type, config_data):
         replies = []