assemblyline-v4-service 4.4.1.dev30__py3-none-any.whl → 4.4.1.dev32__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.4.1.dev30
+4.4.1.dev32

assemblyline_v4_service/updater/updater.py

@@ -107,14 +107,17 @@ class ServiceUpdater(ThreadedCoreBase):
                                         host=self.config.core.redis.nonpersistent.host,
                                         port=self.config.core.redis.nonpersistent.port)
 
-        self.service_change_watcher = EventWatcher(self.redis, deserializer=ServiceChange.deserialize)
+        self.watcher_wakeup_flag = threading.Event()
+        self.service_change_watcher = EventWatcher(self.redis, deserializer=ServiceChange.deserialize,
+                                                   error_event=self.watcher_wakeup_flag)
         self.service_change_watcher.register(f'changes.services.{SERVICE_NAME}', self._handle_service_change_event)
 
-        self.signature_change_watcher = EventWatcher(self.redis, deserializer=SignatureChange.deserialize)
+        self.signature_change_watcher = EventWatcher(self.redis, deserializer=SignatureChange.deserialize,
+                                                     error_event=self.watcher_wakeup_flag)
         self.signature_change_watcher.register(f'changes.signatures.{SERVICE_NAME.lower()}',
                                                self._handle_signature_change_event)
 
-        self.source_update_watcher = EventWatcher(self.redis)
+        self.source_update_watcher = EventWatcher(self.redis, error_event=self.watcher_wakeup_flag)
         self.source_update_watcher.register(f'changes.sources.{SERVICE_NAME.lower()}',
                                             self._handle_source_update_event)
 
@@ -132,6 +135,7 @@ class ServiceUpdater(ThreadedCoreBase):
             'Outward HTTP Server': self._run_http,
             'Run source updates': self._run_source_updates,
             'Run local updates': self._run_local_updates,
+            'Reconnect Handler': self._reconnect_watcher,
         }
         # Only used by updater with 'generates_signatures: false'
         self.latest_updates_dir = os.path.join(UPDATER_DIR, 'latest_updates')
@@ -195,6 +199,7 @@ class ServiceUpdater(ThreadedCoreBase):
         self.source_update_flag.set()
         self.local_update_flag.set()
         self.local_update_start.set()
+        self.watcher_wakeup_flag.set()
 
     def try_run(self):
         self.signature_change_watcher.start()
@@ -202,6 +207,15 @@ class ServiceUpdater(ThreadedCoreBase):
         self.source_update_watcher.start()
         self.maintain_threads(self.expected_threads)
 
+    def _reconnect_watcher(self):
+        while self.running:
+            if self.watcher_wakeup_flag.wait():
+                self.watcher_wakeup_flag.clear()
+                if self.running:
+                    self._pull_settings()
+                    self.local_update_flag.set()
+                    self.source_update_flag.set()
+
     def _run_http(self):
         # Start a server for our http interface in a separate process
         my_env = os.environ.copy()

{assemblyline_v4_service-4.4.1.dev30.dist-info → assemblyline_v4_service-4.4.1.dev32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-v4-service
-Version: 4.4.1.dev30
+Version: 4.4.1.dev32
 Summary: Assemblyline 4 - Service base
 Home-page: https://github.com/CybercentreCanada/assemblyline-v4-service/
 Author: CCCS Assemblyline development team

{assemblyline_v4_service-4.4.1.dev30.dist-info → assemblyline_v4_service-4.4.1.dev32.dist-info}/RECORD

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=ah2l_bh_FYyt1v_gzvsgcVAG8IQ88eEeQ-0su9F4CtU,12
+assemblyline_v4_service/VERSION,sha256=gZoxNNgbHk5n4Hq1P_PmFqtbCdncYtdWujgH3yy4bzc,12
 assemblyline_v4_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/healthz.py,sha256=3QGBg0EZuXC6UN411HFwpLNEop9UvS9feFhvBUTP-k4,1576
 assemblyline_v4_service/run_privileged_service.py,sha256=9uTfHetXR5G-EDKMDrgfWUOw34yr64-cj6Cm9eZaCbQ,14547
@@ -46,9 +46,9 @@ assemblyline_v4_service/updater/__main__.py,sha256=9Os-u8Tf7MD73JSrUSPmOaErTgfve
 assemblyline_v4_service/updater/app.py,sha256=Ass5DZtOCr0tdoRbLo7Qn8Ujlw8T8mUDroAaHxx2oMo,3198
 assemblyline_v4_service/updater/gunicorn_config.py,sha256=p3j2KPBeD5jvMw9O5i7vAtlRgPSVVxIG9AO0DfN82J8,1247
 assemblyline_v4_service/updater/helper.py,sha256=JD0gX3KHY-wvsFjTbWkT83F0d5Up3OfubMPinuNzbTQ,9069
-assemblyline_v4_service/updater/updater.py,sha256=1AYBERGFoIEEXkgXLwozWsLuucBw7ei9FHinkSBq1t0,29016
-assemblyline_v4_service-4.4.1.dev30.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.4.1.dev30.dist-info/METADATA,sha256=lN9Due1bq3YqjpuQ4dQhO_Cg-h2BpDL530Jr8o-YBD4,9359
-assemblyline_v4_service-4.4.1.dev30.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-assemblyline_v4_service-4.4.1.dev30.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
-assemblyline_v4_service-4.4.1.dev30.dist-info/RECORD,,
+assemblyline_v4_service/updater/updater.py,sha256=t3QyMMIGDUQEPXCkR3Q4InQlGsbC31MMUSRoCdAplnI,29718
+assemblyline_v4_service-4.4.1.dev32.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.4.1.dev32.dist-info/METADATA,sha256=_WwOMdJVwP-tgSibgxGIeLtexLWodm98Qoh0Cqz8o_I,9359
+assemblyline_v4_service-4.4.1.dev32.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+assemblyline_v4_service-4.4.1.dev32.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
+assemblyline_v4_service-4.4.1.dev32.dist-info/RECORD,,