From 419991b2e8052fd0d696f810889d88083569d814 Mon Sep 17 00:00:00 2001 From: anmarhindi Date: Tue, 5 Nov 2024 15:38:12 +0100 Subject: [PATCH 1/6] remove config service --- check_config_service | 31 ------------------------------- handler/config_handler.py | 3 ++- start | 3 --- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 check_config_service diff --git a/check_config_service b/check_config_service deleted file mode 100644 index 00bd9d4..0000000 --- a/check_config_service +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -CONFIG_EXISTS=0 -if [ -n "$(docker ps -q -f name=dev-setup_refinery-config_1)" ] -then - if [ "$( docker container inspect -f '{{.State.Status}}' dev-setup_refinery-config_1 )" == "running" ]; - then - CONFIG_EXISTS=1 - fi -elif [ -n "$(docker ps -q -f name=dev-setup-refinery-config-1)" ] -then - if [ "$( docker container inspect -f '{{.State.Status}}' dev-setup-refinery-config-1 )" == "running" ]; - then - CONFIG_EXISTS=1 - fi -else - if [ -n "$(docker ps -q -f name=refinery-config)" ]; - then - if [ "$( docker container inspect -f '{{.State.Status}}' refinery-config )" == "running" ]; - then - CONFIG_EXISTS=1 - fi - fi -fi -if [ $CONFIG_EXISTS -eq 0 ] -then - echo "refinery-config couldn't be found - exit" - exit 1 -else - echo "refinery-config found -> proceeding" -fi - diff --git a/handler/config_handler.py b/handler/config_handler.py index dce1a88..ccd2036 100644 --- a/handler/config_handler.py +++ b/handler/config_handler.py @@ -6,7 +6,8 @@ __config = None # meant as a const value since env variables will be removed at some point -REQUEST_URL = "http://refinery-config:80/full_config" +# REQUEST_URL = "http://refinery-config:80/full_config" +REQUEST_URL = "http:///refinery-gateway/api/v1/misc/full_config" def __get_config() -> Dict[str, Any]: diff --git a/start b/start index 2314697..6cb8ee1 100755 --- a/start +++ b/start @@ -1,9 +1,6 @@ #!/bin/bash trap "echo -ne '\nstopping container...' && docker stop refinery-tokenizer > /dev/null 2>&1 && echo -ne '\t\t [done]\n'" EXIT - -source check_config_service - HIDE_BUILD=0 while getopts :s flag do From bc2ecac829b31abc44b49fd7661aefc76dd44651 Mon Sep 17 00:00:00 2001 From: anmarhindi Date: Tue, 5 Nov 2024 15:51:55 +0100 Subject: [PATCH 2/6] sub ref --- submodules/model | 2 +- submodules/s3 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/model b/submodules/model index dfb4279..67a33b9 160000 --- a/submodules/model +++ b/submodules/model @@ -1 +1 @@ -Subproject commit dfb42793e0a5178c9a793be69b08f696c46fd27d +Subproject commit 67a33b99a200f18202feb7bc5222d2e3d3177972 diff --git a/submodules/s3 b/submodules/s3 index 1ad3ff5..3299fb4 160000 --- a/submodules/s3 +++ b/submodules/s3 @@ -1 +1 @@ -Subproject commit 1ad3ff584860090f4e215986f334b5e63759a55d +Subproject commit 3299fb46876e3b4cc29c0a5cef004005a87f0f19 From 5a7669f36f0052c6274e97f56c4afb80b60ac35d Mon Sep 17 00:00:00 2001 From: anmarhindi Date: Tue, 5 Nov 2024 15:58:30 +0100 Subject: [PATCH 3/6] fix url --- handler/config_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handler/config_handler.py b/handler/config_handler.py index ccd2036..7e2d14e 100644 --- a/handler/config_handler.py +++ b/handler/config_handler.py @@ -7,7 +7,7 @@ # meant as a const value since env variables will be removed at some point # REQUEST_URL = "http://refinery-config:80/full_config" -REQUEST_URL = "http:///refinery-gateway/api/v1/misc/full_config" +REQUEST_URL = "http://refinery-gateway/api/v1/misc/full_config" def __get_config() -> Dict[str, Any]: From 0dcd3f3525ca395850bd3da1a043e9c3c94d30ec Mon Sep 17 00:00:00 2001 From: anmarhindi Date: Tue, 5 Nov 2024 16:01:56 +0100 Subject: [PATCH 4/6] edit --- handler/config_handler.py | 1 - 1 file changed, 1 deletion(-) diff --git a/handler/config_handler.py b/handler/config_handler.py index 7e2d14e..7d3617a 100644 --- a/handler/config_handler.py +++ b/handler/config_handler.py @@ -6,7 +6,6 @@ __config = None # meant as a const value since env variables will be removed at some point -# REQUEST_URL = "http://refinery-config:80/full_config" REQUEST_URL = "http://refinery-gateway/api/v1/misc/full_config" From 421cbe33c5c6136340527448f00b7d235a064af2 Mon Sep 17 00:00:00 2001 From: anmarhindi Date: Tue, 5 Nov 2024 17:31:45 +0100 Subject: [PATCH 5/6] Adjust config route --- handler/config_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handler/config_handler.py b/handler/config_handler.py index 7d3617a..6587b7b 100644 --- a/handler/config_handler.py +++ b/handler/config_handler.py @@ -6,7 +6,7 @@ __config = None # meant as a const value since env variables will be removed at some point -REQUEST_URL = "http://refinery-gateway/api/v1/misc/full_config" +REQUEST_URL = "http://refinery-gateway:80/full_config" def __get_config() -> Dict[str, Any]: From 81ed66b73ec7c09f9bca809a0110f3210c725673 Mon Sep 17 00:00:00 2001 From: JWittmeyer Date: Thu, 14 Nov 2024 15:35:26 +0100 Subject: [PATCH 6/6] some linebreaks --- app.py | 4 +--- submodules/model | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app.py b/app.py index 94b5d49..f9c49c9 100644 --- a/app.py +++ b/app.py @@ -121,6 +121,4 @@ def healthcheck() -> responses.PlainTextResponse: return responses.PlainTextResponse(text, status_code=status_code) - - -session.start_session_cleanup_thread() \ No newline at end of file +session.start_session_cleanup_thread() diff --git a/submodules/model b/submodules/model index 67a33b9..2019057 160000 --- a/submodules/model +++ b/submodules/model @@ -1 +1 @@ -Subproject commit 67a33b99a200f18202feb7bc5222d2e3d3177972 +Subproject commit 201905750781aefb9dcca53a5389144e73edd775