assemblyline-service-client 4.5.1.dev144__py3-none-any.whl → 4.5.1.dev150__py3-none-any.whl

assemblyline_service_client/VERSION

@@ -1 +1 @@
-4.5.1.dev144
+4.5.1.dev150

assemblyline_service_client/task_handler.py

@@ -34,6 +34,7 @@ DEFAULT_API_KEY = 'ThisIsARandomAuthKey...ChangeMe!'
 LOG_LEVEL = logging.getLevelName(os.environ.get("LOG_LEVEL", "INFO"))
 SHUTDOWN_SECONDS_LIMIT = 10
 SUPPORTED_API = 'v1'
+DEFAULT_REQUEST_TIMEOUT = int(os.environ.get("SERVICE_CLIENT_DEFAULT_REQUEST_TIMEOUT", 180))
 TASK_REQUEST_TIMEOUT = int(os.environ.get('TASK_REQUEST_TIMEOUT', 30))
 FILE_REQUEST_TIMEOUT = int(os.environ.get('FILE_REQUEST_TIMEOUT', 180))
 
@@ -184,6 +185,7 @@ class TaskHandler(ServerBase):
             kwargs.pop('headers')
         header_dump = '; '.join(f"{k}={v}" for k, v in self.session.headers.items())
         self.log.debug('query headers: ' + header_dump)
+        kwargs.setdefault('timeout', DEFAULT_REQUEST_TIMEOUT)
 
         retry = 0
 
@@ -335,6 +337,7 @@ class TaskHandler(ServerBase):
             self.status = STATUSES.STOPPING
             self.stop()
             return
+        self.log.info("Service registered with %d heuristics.", len(r['new_heuristics']))
 
         # Update service manifest with data received from service server
         self.update_service_manifest(r['service_config'])

{assemblyline_service_client-4.5.1.dev144.dist-info → assemblyline_service_client-4.5.1.dev150.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-service-client
-Version: 4.5.1.dev144
+Version: 4.5.1.dev150
 Summary: Assemblyline 4 - Service client
 Home-page: https://github.com/CybercentreCanada/assemblyline-service-client/
 Author: CCCS Assemblyline development team

assemblyline_service_client-4.5.1.dev150.dist-info/RECORD

@@ -0,0 +1,8 @@
+assemblyline_service_client/VERSION,sha256=Ps4wqSCNjFBrIdG9lbufHHr9xAZPQHi1a6AdAgCg7C4,13
+assemblyline_service_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+assemblyline_service_client/task_handler.py,sha256=s6UWmcLS0_jjrzOckOqyDxgzjAT8Z03TbaAtSw6VGm4,23655
+assemblyline_service_client-4.5.1.dev150.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_service_client-4.5.1.dev150.dist-info/METADATA,sha256=n-SIHRM8oBqCU1ML-Lc0L8UZtWa9sMWlrUSIrkmxb5M,1578
+assemblyline_service_client-4.5.1.dev150.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+assemblyline_service_client-4.5.1.dev150.dist-info/top_level.txt,sha256=clNWHvn8nw0kR15l5TASxWxIQvKGKe5Pso3kVPMiJv0,28
+assemblyline_service_client-4.5.1.dev150.dist-info/RECORD,,

assemblyline_service_client-4.5.1.dev144.dist-info/RECORD

@@ -1,8 +0,0 @@
-assemblyline_service_client/VERSION,sha256=rywQwY20rUpQRcXxFjh8j4b4DecB0IfnxnsENctejro,13
-assemblyline_service_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-assemblyline_service_client/task_handler.py,sha256=2gHUlSgSOfAkX212gt-1oVrHuOjSH0CfU4owFrcH_fs,23410
-assemblyline_service_client-4.5.1.dev144.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_service_client-4.5.1.dev144.dist-info/METADATA,sha256=RzklW2IAg8EjMPE4I_63XpAhdb3rduN5JNLvOSvZnMg,1578
-assemblyline_service_client-4.5.1.dev144.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-assemblyline_service_client-4.5.1.dev144.dist-info/top_level.txt,sha256=clNWHvn8nw0kR15l5TASxWxIQvKGKe5Pso3kVPMiJv0,28
-assemblyline_service_client-4.5.1.dev144.dist-info/RECORD,,