#139: Send a request for ICAT properties at start-up only

ral-facilities · Sep 14, 2020 · 7256627 · 7256627
1 parent 61b63a2
commit 7256627
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/common/config.py b/common/config.py
@@ -81,7 +81,6 @@ def get_icat_properties(self):
         properties_url = f"{config.get_icat_url()}/icat/properties"
         r = requests.request("GET", properties_url, verify=config.get_icat_check_cert())
         icat_properties = r.json()
-        log.debug("ICAT Properties: %s", icat_properties)
 
         return icat_properties
 

diff --git a/common/constants.py b/common/constants.py
@@ -4,3 +4,4 @@
 class Constants:
     DATABASE_URL = config.get_db_url()
     ACCEPTED_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
+    ICAT_PROPERTIES = config.get_icat_properties()
diff --git a/common/icat/filters.py b/common/icat/filters.py
@@ -10,6 +10,7 @@
 )
 from common.exceptions import FilterError
 from common.config import config
+from common.constants import Constants
 
 log = logging.getLogger()
 
@@ -104,7 +105,7 @@ def __init__(self, skip_value):
         super().__init__(skip_value)
 
     def apply_filter(self, query):
-        icat_properties = config.get_icat_properties()
+        icat_properties = Constants.ICAT_PROPERTIES
         icat_set_limit(query, self.skip_value, icat_properties["maxEntities"])