From f891d0cf7d319506056e336a1792c0fb06e87ba8 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Tue, 22 Aug 2023 09:00:12 +0200 Subject: [PATCH 1/3] fix log level if env var is provided --- docker/cygnus-ngsi/cygnus-entrypoint.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/cygnus-ngsi/cygnus-entrypoint.sh b/docker/cygnus-ngsi/cygnus-entrypoint.sh index 2f2d759b7..9b54af734 100755 --- a/docker/cygnus-ngsi/cygnus-entrypoint.sh +++ b/docker/cygnus-ngsi/cygnus-entrypoint.sh @@ -1005,6 +1005,11 @@ fi touch /var/log/cygnus/cygnus.log ln -snf /dev/stdout /var/log/cygnus/cygnus.log & PIDS="$PIDS $!" +if [ "$CYGNUS_LOG_LEVEL" ]; then + (sleep 10; curl -X PUT 'http://localhost:'$CYGNUS_API_PORT'/admin/log?level='$CYGNUS_LOG_LEVEL) & +fi + + wait $PIDS trap - TERM INT wait $PIDS From 52638bd866ded069f8a237931bee62b54d8af92e Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Tue, 22 Aug 2023 09:02:04 +0200 Subject: [PATCH 2/3] Update CNR --- CHANGES_NEXT_RELEASE | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 4d695a238..851c70dea 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,3 +1,4 @@ +- [cygnus-ngsi] Switch log level to CYGNUS_LOG_LEVEL env var if was provided to docker (#2886) - [cygnus-common][SQL] Fix expiration records tablename used by delete and select (#2265) - [cygnus-common][SQL] Fix expiration records select with a limit to avoid java out of memory error (#2273) - [cygnus-ngsi] Removes "_" in schema name for DM -schema family (#2270, #2201 reopens for Postgis) From a1f199a0e0161a3c98e9a24ebd1103b3b6bf0804 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Tue, 22 Aug 2023 09:11:41 +0200 Subject: [PATCH 3/3] fix CNR --- CHANGES_NEXT_RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 851c70dea..2119a432f 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,4 +1,4 @@ -- [cygnus-ngsi] Switch log level to CYGNUS_LOG_LEVEL env var if was provided to docker (#2886) +- [cygnus-ngsi] Switch log level to CYGNUS_LOG_LEVEL env var if was provided to docker (#2286) - [cygnus-common][SQL] Fix expiration records tablename used by delete and select (#2265) - [cygnus-common][SQL] Fix expiration records select with a limit to avoid java out of memory error (#2273) - [cygnus-ngsi] Removes "_" in schema name for DM -schema family (#2270, #2201 reopens for Postgis)