Merge pull request #291 from CybercentreCanada/persistent-service-update

comment out use of FILE_UPDATE_DIRECTORY
CybercentreCanada · Sep 3, 2021 · 56aa567 · 56aa567
2 parents 10c4e7e + a658581
commit 56aa567
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/assemblyline_core/updater/run_updater.py b/assemblyline_core/updater/run_updater.py
@@ -309,14 +309,14 @@ def launch(self, name, docker_config: DockerConfig, mounts, env, network, blocki
 
         if CLASSIFICATION_CONFIGMAP:
             volumes.append(V1Volume(
-                name=f'mount-classification',
+                name='mount-classification',
                 config_map=V1ConfigMapVolumeSource(
                     name=CLASSIFICATION_CONFIGMAP
                 ),
             ))
 
             volume_mounts.append(V1VolumeMount(
-                name=f'mount-classification',
+                name='mount-classification',
                 mount_path='/etc/assemblyline/classification.yml',
                 sub_path=CLASSIFICATION_CONFIGMAP_KEY,
                 read_only=True,
@@ -450,9 +450,11 @@ def __init__(self, redis_persist=None, redis=None, logger=None, datastore=None):
         # have some performance down sides, but may help us run into fewer docker FS overlay
         # cleanup issues. Try to flush it out every time we start. This service should
         # be a singleton anyway.
-        self.temporary_directory = os.path.join(FILE_UPDATE_DIRECTORY, '.tmp')
-        shutil.rmtree(self.temporary_directory, ignore_errors=True)
-        os.makedirs(self.temporary_directory)
+        ################################# DELETE FOR PSU CHANGE#########################
+        # self.temporary_directory = os.path.join(FILE_UPDATE_DIRECTORY, '.tmp')
+        # shutil.rmtree(self.temporary_directory, ignore_errors=True)
+        # os.makedirs(self.temporary_directory)
+        ################################# DELETE FOR PSU CHANGE#########################
 
         self.container_update = Hash('container-update', self.redis_persist)
         self.services = Hash('service-updates', self.redis_persist)