From fcb884a122c4a4a36d6064d054a71fc247ba56a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sidor?= Date: Fri, 20 Aug 2021 15:31:46 +0200 Subject: [PATCH 1/3] fix(config): Use correct argument name for port --- relay/src/cli.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relay/src/cli.rs b/relay/src/cli.rs index 19f1e69a81..00de92c998 100644 --- a/relay/src/cli.rs +++ b/relay/src/cli.rs @@ -63,7 +63,7 @@ pub fn extract_config_args(matches: &ArgMatches) -> OverridableConfig { OverridableConfig { upstream: matches.value_of("upstream").map(str::to_owned), host: matches.value_of("host").map(str::to_owned), - port: matches.value_of("redis_url").map(str::to_owned), + port: matches.value_of("port").map(str::to_owned), processing, kafka_url: matches.value_of("kafka_broker_url").map(str::to_owned), redis_url: matches.value_of("redis_url").map(str::to_owned), From 4f9b8f7fa53e002bf2a0d61c8a4387abca2a4699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sidor?= Date: Fri, 20 Aug 2021 15:35:13 +0200 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70a66c4521..dfcdfed73c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +**Bug Fixes**: + +- Use correct commandline argument name for setting Relay port. ([#1059](https://github.com/getsentry/relay/pull/1059)) + ## 21.8.0 - No documented changes. From b8d87daac84135d617ee6062c5aa13fbfb2bd105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sidor?= Date: Fri, 20 Aug 2021 16:55:40 +0200 Subject: [PATCH 3/3] Extend integration test timeout to 10 minutes --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index c5f9dde377..58848b860b 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -78,7 +78,7 @@ steps: echo '{"version": "3.4", "networks":{"default":{"external":{"name":"cloudbuild"}}}}' > docker-compose.override.yml ./install.sh ./test.sh || docker-compose logs nginx web relay - timeout: 450s + timeout: 600s - name: 'gcr.io/cloud-builders/docker' secretEnv: ['DOCKER_PASSWORD']