tmp

pg-sharding · Apr 3, 2024 · 3d1a10c · 3d1a10c
1 parent 191b7a8
commit 3d1a10c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/docker/router/Dockerfile b/docker/router/Dockerfile
@@ -3,4 +3,4 @@ FROM spqr-base-image
 RUN apt-get update && apt-get install -y postgresql-client
 COPY ./docker/router/ssl/localhost.crt /etc/spqr/ssl/server.crt
 COPY ./docker/router/ssl/localhost.key /etc/spqr/ssl/server.key
-ENTRYPOINT CONFIG_PATH=${ROUTER_CONFIG=/spqr/docker/router/cfg.yaml} COORD_CONFIG_PATH=${COORDINATOR_CONFIG=/spqr/docker/coordinator/cfg.yaml} && CUR_HOST=$(cat ${CONFIG_PATH} | grep "host:") && sed -i "s/${CUR_HOST}/${ROUTER_HOST=${CUR_HOST}}/g" ${CONFIG_PATH} && /spqr/spqr-router run --config ${CONFIG_PATH} --coordinator-config ${COORD_CONFIG_PATH}
+ENTRYPOINT CONFIG_PATH=${ROUTER_CONFIG=/spqr/docker/router/cfg.yaml} COORD_CONFIG_PATH=${COORDINATOR_CONFIG=/spqr/docker/coordinator/cfg.yaml} && CUR_HOST=$(cat ${CONFIG_PATH} | grep "host:") && sed -i "s/${CUR_HOST}/${ROUTER_HOST=${CUR_HOST}}/g" ${CONFIG_PATH}  && /spqr/spqr-router run --config ${CONFIG_PATH} --coordinator-config ${COORD_CONFIG_PATH} >> ${ROUTER_LOG}
diff --git a/test/feature/conf/router_cluster.yaml b/test/feature/conf/router_cluster.yaml
@@ -4,7 +4,6 @@ admin_console_port: '7432'
 grpc_api_port: '7000'
 router_mode: PROXY
 log_level: debug
-log_filename: router.log
 time_quantiles:
   - 0.75
 world_shard_fallback: true

diff --git a/test/feature/docker-compose.yaml b/test/feature/docker-compose.yaml
@@ -40,6 +40,7 @@ services:
       - "7012:7002"
     environment:
       - ROUTER_CONFIG=${ROUTER_CONFIG}
+      - ROUTER_LOG='router1.log'
       - 'ROUTER_HOST=host: ''regress_router'''
       - COORDINATOR_CONFIG=${COORDINATOR_CONFIG}
     hostname: regress_router
@@ -65,6 +66,7 @@ services:
       - "7022:7002"
     environment:
       - ROUTER_CONFIG=${ROUTER_CONFIG}
+      - ROUTER_LOG='router2.log'
       - 'ROUTER_HOST=host: ''regress_router_2'''
       - COORDINATOR_CONFIG=${COORDINATOR_CONFIG_2}
     hostname: regress_router_2