Merge branch 'master' of github.com:KNMI/adaguc-server into update-sc…

…an-scripts

.github/workflows/docker-publish.yml

@@ -33,6 +33,9 @@ jobs:
           vuln-type: 'os,library'
           trivyignores: .trivyignore
 #          severity: 'CRITICAL,HIGH'
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2
+          TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db:1
   docker-build-and-publish:
     name: Build Docker image and potentially push to Docker Hub
     runs-on: ubuntu-latest

Dockerfile

@@ -6,7 +6,7 @@ USER root
 LABEL maintainer="[email protected]"
 
 # Version should be same as in Definitions.h
-LABEL version="2.28.1"
+LABEL version="2.28.2"
 
 # Try to update image packages
 RUN apt-get -q -y update \

NEWS.md

@@ -1,3 +1,6 @@
+**Version 2.28.2 2024-10-23**
+- Fix bug which caused sheduled metadata updates to only work intermittently.
+
 **Version 2.28.1 2024-10-11**
 - Windbarbs on modelfields can now display the windspeed in kts as text when rendertextforvectors in RenderSettings is set to true.
 

adagucserverEC/Definitions.h

@@ -28,7 +28,7 @@
 #ifndef Definitions_H
 #define Definitions_H
 
-#define ADAGUCSERVER_VERSION "2.28.1" // Please also update in the Dockerfile to the same version
+#define ADAGUCSERVER_VERSION "2.28.2" // Please also update in the Dockerfile to the same version
 
 // CConfigReaderLayerType
 #define CConfigReaderLayerTypeUnknown 0

python/lib/adaguc/runAdaguc.py

@@ -101,16 +101,13 @@ def getAdagucEnv(self, adagucenv = {}):
 
         return adagucenv
 
-    def updateLayerMetadata(self):
+    async def updateLayerMetadata(self):
         """Uses the adaguc executable to update the layermetadatatable"""
         adagucenv = self.getAdagucEnv()
-        status, data, headers = asyncio.run(
-            self.runADAGUCServer(
-                args=["--updatelayermetadata"], env=adagucenv, isCGI=False, showLogOnError = True
-            )
+        status, data, headers = await self.runADAGUCServer(
+            args=["--updatelayermetadata"], env=adagucenv, isCGI=False, showLogOnError = True
         )
 
-
         return status, data.getvalue().decode()        
 
     def scanDataset(self, datasetName):

python/python_fastapi_server/main.py

@@ -2,6 +2,7 @@
 import logging
 import os
 import time
+from contextlib import asynccontextmanager
 from urllib.parse import urlsplit
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 import uvicorn
@@ -25,17 +26,19 @@
 
 logger = logging.getLogger(__name__)
 
-def update_layermetadatatable():
+
+async def update_layermetadatatable():
     """Update layermetadata table in adaguc for GetCapabilities caching"""
     adaguc = setup_adaguc(False)
     logger.info("Calling updateLayerMetadata")
-    status, log = adaguc.updateLayerMetadata()
+    status, log = await adaguc.updateLayerMetadata()
     if adaguc.isLoggingEnabled():
         logger.info(log)
     else:
         logger.info("Logging for updateLayerMetadata is disabled, status was %d", status)
 
 
+@asynccontextmanager
 async def lifespan(_fastapiapp: FastAPI):
     """Captures FASTAPI Lifespan events to start the AsyncIOScheduler"""