Merge pull request #352 from DigitalSlideArchive/duplicate-cli-images

Remove duplicates from list of cli images to provision
DigitalSlideArchive · Aug 19, 2024 · 5e59ecb · 5e59ecb
2 parents a244d61 + a950fbc
commit 5e59ecb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/devops/dsa/provision.py b/devops/dsa/provision.py
@@ -218,7 +218,8 @@ def get_slicer_images(imageList, adminUser, alwaysPull=False):
         job = Job().load(id=job['_id'], user=adminUser, includeLog=True)
         if 'log' in job:
             while logpos < len(job['log']):
-                logger.info(job['log'][logpos].rstrip())
+                if 'Pulling' not in job['log'][logpos] or '%' not in job['log'][logpos]:
+                    logger.info(job['log'][logpos].rstrip())
                 logpos += 1
     t.join()
     if 'log' not in job:
@@ -337,15 +338,19 @@ def provision(opts):  # noqa
             value = value_from_resource(value, adminUser)
             logger.info('Setting %s to %r', key, value)
             Setting().set(key, value)
+    images = []
     if getattr(opts, 'slicer-cli-image-pull', None):
+        images = list(dict.fromkeys(getattr(opts, 'slicer-cli-image-pull', None)))
         try:
             get_slicer_images(getattr(opts, 'slicer-cli-image-pull', None),
                               adminUser, alwaysPull=True)
         except Exception:
             logger.info('Cannot fetch slicer-cli-images.')
     if getattr(opts, 'slicer-cli-image', None):
+        images = [image for image in dict.fromkeys(getattr(opts, 'slicer-cli-image', None))
+                  if image not in images]
         try:
-            get_slicer_images(getattr(opts, 'slicer-cli-image', None), adminUser)
+            get_slicer_images(images, adminUser)
         except Exception:
             logger.info('Cannot fetch slicer-cli-images.')
 

diff --git a/devops/minimal/provision.py b/devops/minimal/provision.py
@@ -218,7 +218,8 @@ def get_slicer_images(imageList, adminUser, alwaysPull=False):
         job = Job().load(id=job['_id'], user=adminUser, includeLog=True)
         if 'log' in job:
             while logpos < len(job['log']):
-                logger.info(job['log'][logpos].rstrip())
+                if 'Pulling' not in job['log'][logpos] or '%' not in job['log'][logpos]:
+                    logger.info(job['log'][logpos].rstrip())
                 logpos += 1
     t.join()
     if 'log' not in job:
@@ -337,15 +338,19 @@ def provision(opts):  # noqa
             value = value_from_resource(value, adminUser)
             logger.info('Setting %s to %r', key, value)
             Setting().set(key, value)
+    images = []
     if getattr(opts, 'slicer-cli-image-pull', None):
+        images = list(dict.fromkeys(getattr(opts, 'slicer-cli-image-pull', None)))
         try:
             get_slicer_images(getattr(opts, 'slicer-cli-image-pull', None),
                               adminUser, alwaysPull=True)
         except Exception:
             logger.info('Cannot fetch slicer-cli-images.')
     if getattr(opts, 'slicer-cli-image', None):
+        images = [image for image in dict.fromkeys(getattr(opts, 'slicer-cli-image', None))
+                  if image not in images]
         try:
-            get_slicer_images(getattr(opts, 'slicer-cli-image', None), adminUser)
+            get_slicer_images(images, adminUser)
         except Exception:
             logger.info('Cannot fetch slicer-cli-images.')
 
@@ -700,8 +705,10 @@ def __call__(self, parser, namespace, values, option_string=None):
     if getattr(opts, 'portion', None) in {'main', None}:
         # This loads plugins, allowing setting validation.  We want the import
         # to be after the preprovision step.
+        from girder import _attachFileLogHandlers
         from girder.utility.server import configureServer
 
+        _attachFileLogHandlers()
         configureServer()
         if getattr(opts, 'mongo-compat', None) is not False:
             from girder.models import getDbConnection