assemblyline-service-client 4.5.1.dev144__py3-none-any.whl → 4.5.1.dev145__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of assemblyline-service-client might be problematic. Click here for more details.
- assemblyline_service_client/VERSION +1 -1
- assemblyline_service_client/task_handler.py +3 -0
- {assemblyline_service_client-4.5.1.dev144.dist-info → assemblyline_service_client-4.5.1.dev145.dist-info}/METADATA +1 -1
- assemblyline_service_client-4.5.1.dev145.dist-info/RECORD +8 -0
- assemblyline_service_client-4.5.1.dev144.dist-info/RECORD +0 -8
- {assemblyline_service_client-4.5.1.dev144.dist-info → assemblyline_service_client-4.5.1.dev145.dist-info}/LICENCE.md +0 -0
- {assemblyline_service_client-4.5.1.dev144.dist-info → assemblyline_service_client-4.5.1.dev145.dist-info}/WHEEL +0 -0
- {assemblyline_service_client-4.5.1.dev144.dist-info → assemblyline_service_client-4.5.1.dev145.dist-info}/top_level.txt +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
4.5.1.
|
|
1
|
+
4.5.1.dev145
|
|
@@ -34,6 +34,7 @@ DEFAULT_API_KEY = 'ThisIsARandomAuthKey...ChangeMe!'
|
|
|
34
34
|
LOG_LEVEL = logging.getLevelName(os.environ.get("LOG_LEVEL", "INFO"))
|
|
35
35
|
SHUTDOWN_SECONDS_LIMIT = 10
|
|
36
36
|
SUPPORTED_API = 'v1'
|
|
37
|
+
DEFAULT_REQUEST_TIMEOUT = int(os.environ.get("SERVICE_CLIENT_DEFAULT_REQUEST_TIMEOUT", 180))
|
|
37
38
|
TASK_REQUEST_TIMEOUT = int(os.environ.get('TASK_REQUEST_TIMEOUT', 30))
|
|
38
39
|
FILE_REQUEST_TIMEOUT = int(os.environ.get('FILE_REQUEST_TIMEOUT', 180))
|
|
39
40
|
|
|
@@ -184,6 +185,7 @@ class TaskHandler(ServerBase):
|
|
|
184
185
|
kwargs.pop('headers')
|
|
185
186
|
header_dump = '; '.join(f"{k}={v}" for k, v in self.session.headers.items())
|
|
186
187
|
self.log.debug('query headers: ' + header_dump)
|
|
188
|
+
kwargs.setdefault('timeout', DEFAULT_REQUEST_TIMEOUT)
|
|
187
189
|
|
|
188
190
|
retry = 0
|
|
189
191
|
|
|
@@ -335,6 +337,7 @@ class TaskHandler(ServerBase):
|
|
|
335
337
|
self.status = STATUSES.STOPPING
|
|
336
338
|
self.stop()
|
|
337
339
|
return
|
|
340
|
+
self.log.info("Service registered with %d heuristics.", len(r['new_heuristics']))
|
|
338
341
|
|
|
339
342
|
# Update service manifest with data received from service server
|
|
340
343
|
self.update_service_manifest(r['service_config'])
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: assemblyline-service-client
|
|
3
|
-
Version: 4.5.1.
|
|
3
|
+
Version: 4.5.1.dev145
|
|
4
4
|
Summary: Assemblyline 4 - Service client
|
|
5
5
|
Home-page: https://github.com/CybercentreCanada/assemblyline-service-client/
|
|
6
6
|
Author: CCCS Assemblyline development team
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
assemblyline_service_client/VERSION,sha256=b799qyU3zzLYly-rIhHX4DawyXKJQ0pOzJhoWRe0Iis,13
|
|
2
|
+
assemblyline_service_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
3
|
+
assemblyline_service_client/task_handler.py,sha256=s6UWmcLS0_jjrzOckOqyDxgzjAT8Z03TbaAtSw6VGm4,23655
|
|
4
|
+
assemblyline_service_client-4.5.1.dev145.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
|
|
5
|
+
assemblyline_service_client-4.5.1.dev145.dist-info/METADATA,sha256=3y68-2XJ1HjjZGQGNUImBcuud1KFO2Q7EgUUtZzkBRk,1578
|
|
6
|
+
assemblyline_service_client-4.5.1.dev145.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
|
|
7
|
+
assemblyline_service_client-4.5.1.dev145.dist-info/top_level.txt,sha256=clNWHvn8nw0kR15l5TASxWxIQvKGKe5Pso3kVPMiJv0,28
|
|
8
|
+
assemblyline_service_client-4.5.1.dev145.dist-info/RECORD,,
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
assemblyline_service_client/VERSION,sha256=rywQwY20rUpQRcXxFjh8j4b4DecB0IfnxnsENctejro,13
|
|
2
|
-
assemblyline_service_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
3
|
-
assemblyline_service_client/task_handler.py,sha256=2gHUlSgSOfAkX212gt-1oVrHuOjSH0CfU4owFrcH_fs,23410
|
|
4
|
-
assemblyline_service_client-4.5.1.dev144.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
|
|
5
|
-
assemblyline_service_client-4.5.1.dev144.dist-info/METADATA,sha256=RzklW2IAg8EjMPE4I_63XpAhdb3rduN5JNLvOSvZnMg,1578
|
|
6
|
-
assemblyline_service_client-4.5.1.dev144.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
|
|
7
|
-
assemblyline_service_client-4.5.1.dev144.dist-info/top_level.txt,sha256=clNWHvn8nw0kR15l5TASxWxIQvKGKe5Pso3kVPMiJv0,28
|
|
8
|
-
assemblyline_service_client-4.5.1.dev144.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|