chore(local dev): Allow for custom GRPC port to be specified

Author: NicoHinderling

.envrc

@@ -17,3 +17,6 @@ export VIRTUAL_ENV="${PWD}/.venv"
 PATH_add "${PWD}/.venv/bin"
 
 PATH_add /opt/homebrew/opt/rustup/bin
+
+# Set to 50055 by default for local development
+export TASKBROKER_DEVSERVICES_GRPC_PORT="50055"

Dockerfile

@@ -3,7 +3,7 @@
 # recent enough version of protobuf-compiler
 FROM rust:1-bookworm AS build
 
-RUN apt-get update && apt-get upgrade -y 
+RUN apt-get update && apt-get upgrade -y
 RUN apt-get install -y cmake pkg-config libssl-dev librdkafka-dev protobuf-compiler
 
 RUN USER=root cargo new --bin taskbroker
@@ -41,6 +41,7 @@ RUN groupadd taskbroker --gid 1000 && useradd --gid taskbroker --uid 1000 taskbr
 RUN apt-get update && apt-get upgrade -y && apt-get install -y libssl-dev libsqlite3-dev libsqlite3-0 openssl ca-certificates
 
 EXPOSE 50051
+EXPOSE 50055
 
 # For the sqlite to be mounted too
 RUN mkdir /opt/sqlite
@@ -54,4 +55,4 @@ WORKDIR /opt
 CMD ["/opt/taskbroker"]
 
 # To build and run locally:
-# docker build -t taskbroker --no-cache . && docker rm taskbroker && docker run --name taskbroker -p 127.0.0.1:50051:50051 -e TASKBROKER_KAFKA_CLUSTER=sentry_kafka:9093 --network sentry  taskbroker
+# docker build -t taskbroker --no-cache . && docker rm taskbroker && docker run --name taskbroker -p 127.0.0.1:50055:50055 -e TASKBROKER_KAFKA_CLUSTER=sentry_kafka:9093 --network sentry  taskbroker

devservices/config.yml

@@ -25,8 +25,9 @@ services:
     environment:
       TASKBROKER_KAFKA_CLUSTER: "kafka-kafka-1:9093"
       TASKBROKER_CREATE_MISSING_TOPICS: "true"
+      TASKBROKER_DEVSERVICES_GRPC_PORT: "50055"
     ports:
-      - 127.0.0.1:50051:50051
+      - 127.0.0.1:50055:50055
     networks:
       - devservices
     labels:

src/config.rs

@@ -222,7 +222,10 @@ impl Default for Config {
             log_filter: "info,librdkafka=warn,h2=off".to_owned(),
             log_format: LogFormat::Text,
             grpc_addr: "0.0.0.0".to_owned(),
-            grpc_port: 50051,
+            grpc_port: std::env::var("TASKBROKER_DEVSERVICES_GRPC_PORT")
+                .ok()
+                .and_then(|v| v.parse().ok())
+                .unwrap_or(50051),
             grpc_shared_secret: vec![],
             statsd_addr: "127.0.0.1:8126".parse().unwrap(),
             default_metrics_tags: Default::default(),