Merge branch 'bugfix/websocket-versioning' into zsb/dev

amadolid · Nov 24, 2023 · 3f440e6 · 3f440e6
2 parents 7de5bca + cd67070
commit 3f440e6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/jaseci_core/jaseci/extens/svc/elastic_svc.py b/jaseci_core/jaseci/extens/svc/elastic_svc.py
@@ -78,15 +78,16 @@ def run(self):
  self.app.health("timeout=1s")
 
  def post_run(self):
- under_test = self.config.get("under_test", False)
- if not under_test:
- self.configure_elastic()
- LOG_QUEUES["core"] = self.add_elastic_log_handler(
- logger, self.config.get("core_log_index") or "core", under_test
- )
- LOG_QUEUES["app"] = self.add_elastic_log_handler(
- app_logger, self.config.get("app_log_index") or "app", under_test
- )
+ if multiprocessing.current_process().name == "MainProcess":
+ under_test = self.config.get("under_test", False)
+ if not under_test:
+ self.configure_elastic()
+ LOG_QUEUES["core"] = self.add_elastic_log_handler(
+ logger, self.config.get("core_log_index") or "core", under_test
+ )
+ LOG_QUEUES["app"] = self.add_elastic_log_handler(
+ app_logger, self.config.get("app_log_index") or "app", under_test
+ )
 
  def configure_elastic(self):
  """

diff --git a/jaseci_serv/jaseci_serv/socket/consumer.py b/jaseci_serv/jaseci_serv/socket/consumer.py
@@ -47,6 +47,9 @@ def receive(self, text_data=None, bytes_data=None):
  self.group, {"type": "notify", "data": data}
  )
 
+ def disconnect(self, close_code):
+ async_to_sync(self.channel_layer.group_discard)(self.group, self.channel_name)
+
  def notify(self, data):
  self.send(text_data=dumps(data))