fix: logic of Client.close (#12)

* feat: add close function for Client

* style: format python code (pep8)

* Update client.py

* fix: Client.close logic

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

Author: hezean

featureprobe/client.py

@@ -56,9 +56,10 @@ def flush(self):
         self._event_processor.flush()
 
     def close(self):
+        """Safely shut down FeatureProbe client instance"""
         Client.__logger.info('Closing FeatureProbe Client')
+        self._event_processor.shutdown()
         self._synchronizer.close()
-        self.flush()
         self._data_repo.close()
 
     def value(self, toggle_key: str, user: User, default) -> Any:

featureprobe/default_event_processor.py

@@ -102,10 +102,10 @@ def __init__(self, context: Context):
             context.http_config.conn_timeout,
             context.http_config.read_timeout)
 
-        event_repository = EventRepository()
+        self._event_repository = EventRepository()
         handler_thread = threading.Thread(
             target=self._handle_event, args=(
-                self._events, event_repository), daemon=True)
+                self._events, self._event_repository), daemon=True)
         handler_thread.start()
 
         self._executor = ThreadPoolExecutor(max_workers=5)
@@ -139,11 +139,7 @@ def flush(self):
                     DefaultEventProcessor._LOG_BUSY_EVENT)
 
     def shutdown(self):
-        if self._closed:
-            return
-        self._closed = True
-        self._events.put(EventAction(EventAction.Type.FLUSH, None))
-        self._events.put(EventAction(EventAction.Type.SHUTDOWN, None))
+        self._do_shutdown()
 
     def _handle_event(self, events: Queue, event_repo: EventRepository):
         actions = []
@@ -167,7 +163,12 @@ def _handle_event(self, events: Queue, event_repo: EventRepository):
                     'FeatureProbe event handle error', exc_info=e)
 
     def _do_shutdown(self):
-        self._executor.shutdown(wait=False)
+        if self._closed:
+            return
+        self._closed = True
+        self._process_flush(self._event_repository)
+        self._scheduler.shutdown(wait=True)
+        self._executor.shutdown(wait=True)
 
     def _process_event(self, event: Event, event_repo: EventRepository):
         event_repo.add(event)

featureprobe/memory_data_repository.py

@@ -61,4 +61,4 @@ def initialized(self) -> bool:
         return self._initialized
 
     def close(self):
-        return
+        self._data = None