Merge pull request #488 from CDLUC3/develop

Develop
CDLUC3 · Oct 18, 2023 · 4617b6b · 4617b6b
2 parents 5a01782 + 073353c
commit 4617b6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/ezidapp/management/commands/proc-cleanup-async-queues.py b/ezidapp/management/commands/proc-cleanup-async-queues.py
@@ -55,8 +55,7 @@ def run(self):
                 None
         """
         # keep running until terminated
-        keepRunning = True
-        while keepRunning:
+        while not self.terminated():
             currentTime=int(time.time())
             timeDelta=django.conf.settings.DAEMONS_CHECK_IDENTIFIER_ASYNC_STATUS_TIMESTAMP
 
@@ -91,7 +90,6 @@ def run(self):
                     # mark as 'OK' to delete from the refIdentifier
                     if not qs:
                         identifierStatus[key] = True
-                        self.sleep(django.conf.settings.DAEMONS_IDLE_SLEEP)
                         continue
 
                     for task_model in qs:
@@ -113,8 +111,6 @@ def run(self):
                         "Delete identifier: " + refId.identifier + " from refIdentifier table.")
                     self.deleteRecord(self.refIdentifier, refId.pk, record_type='refId', identifier=refId.identifier)
 
-            keepRunning=False
-
             self.sleep(django.conf.settings.DAEMONS_BATCH_SLEEP)
 
     def deleteRecord(self, queue, primary_key, record_type=None, identifier=None):

diff --git a/ezidapp/management/commands/shoulder-update-organization.py b/ezidapp/management/commands/shoulder-update-organization.py
@@ -61,7 +61,7 @@ def handle(self, *_, **opt):
                 'Scheme must be "ark" or "doi": {}'.format(scheme_str)
             )
 
-        namespace_str = '{}:{}'.format(scheme_str, full_shoulder.upper())
+        namespace_str = '{}:{}'.format(scheme_str, full_shoulder)
 
         try:
             shoulder_model = ezidapp.models.shoulder.Shoulder.objects.get(prefix=namespace_str)