From 9d73f429828b3f6c9b2ce0a62d0bfeda825c7392 Mon Sep 17 00:00:00 2001 From: Julius Unverfehrt Date: Mon, 20 Jun 2022 08:19:51 +0200 Subject: [PATCH 1/4] remove duplicate pickup metrics --- pyinfra/server/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyinfra/server/server.py b/pyinfra/server/server.py index 65396f7..aac505a 100644 --- a/pyinfra/server/server.py +++ b/pyinfra/server/server.py @@ -53,13 +53,14 @@ def __set_up_processing_server_impl(operation2function: Dict[str, QueuedStreamFu } def make_summary_instance(op): + op = op.replace("_pickup", "") return Summary(f"redactmanager_{op}_seconds", f"Time spent on {op}.", registry=registry) submit_operation2processor = {submit_suffix(op): prc for op, prc in operation2processor.items()} pickup_operation2processor = {pickup_suffix(op): prc for op, prc in operation2processor.items()} operation2processor = merge(submit_operation2processor, pickup_operation2processor) - operation2metric = {op: make_summary_instance(op) for op in operation2processor} + operation2metric = {op: make_summary_instance(op) for op in pickup_operation2processor} @app.route("/ready", methods=["GET"]) def ready(): From e9424aee04087b8602955a024915a9ab37c87606 Mon Sep 17 00:00:00 2001 From: Julius Unverfehrt Date: Mon, 20 Jun 2022 08:29:33 +0200 Subject: [PATCH 2/4] remove duplicate pickup metrics --- pyinfra/server/server.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyinfra/server/server.py b/pyinfra/server/server.py index aac505a..82c92e9 100644 --- a/pyinfra/server/server.py +++ b/pyinfra/server/server.py @@ -52,7 +52,7 @@ def __set_up_processing_server_impl(operation2function: Dict[str, QueuedStreamFu op: LazyRestProcessor(fn, **build_endpoint_suffixes(op)) for op, fn in operation2function.items() } - def make_summary_instance(op): + def make_summary_instance(op: str): op = op.replace("_pickup", "") return Summary(f"redactmanager_{op}_seconds", f"Time spent on {op}.", registry=registry) @@ -61,6 +61,7 @@ def __set_up_processing_server_impl(operation2function: Dict[str, QueuedStreamFu operation2processor = merge(submit_operation2processor, pickup_operation2processor) operation2metric = {op: make_summary_instance(op) for op in pickup_operation2processor} + print(operation2metric) @app.route("/ready", methods=["GET"]) def ready(): @@ -84,7 +85,7 @@ def __set_up_processing_server_impl(operation2function: Dict[str, QueuedStreamFu @app.route("/", methods=["GET"]) def pickup(operation): - with operation2metric[operation.replace("_pickup", "")].time(): + with operation2metric[operation].time(): return operation2processor[operation].pop() return app From 2dff7d62aaec01921587832fc9890eefc4e20a47 Mon Sep 17 00:00:00 2001 From: Julius Unverfehrt Date: Mon, 20 Jun 2022 10:27:36 +0200 Subject: [PATCH 3/4] remove duplicate pickup metrics --- pyinfra/server/server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pyinfra/server/server.py b/pyinfra/server/server.py index 82c92e9..8e471f4 100644 --- a/pyinfra/server/server.py +++ b/pyinfra/server/server.py @@ -61,7 +61,6 @@ def __set_up_processing_server_impl(operation2function: Dict[str, QueuedStreamFu operation2processor = merge(submit_operation2processor, pickup_operation2processor) operation2metric = {op: make_summary_instance(op) for op in pickup_operation2processor} - print(operation2metric) @app.route("/ready", methods=["GET"]) def ready(): From 0d87c60fce789600a7322d25c3faf3ea0bcacb07 Mon Sep 17 00:00:00 2001 From: Julius Unverfehrt Date: Mon, 20 Jun 2022 11:43:33 +0200 Subject: [PATCH 4/4] parametrize download strategy --- config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index 7f8cafa..4a52b80 100755 --- a/config.yaml +++ b/config.yaml @@ -7,7 +7,7 @@ service: response_folder: $RESPONSE_FOLDER|null # Specifies, how to handle the `page` key of a request. "multi" will download all pages matching the list of pages # specified in the request - download_strategy: single + download_strategy: $DOWNLOAD_STRATEGY|single probing_webserver: host: $PROBING_WEBSERVER_HOST|"0.0.0.0" # Probe webserver address