From 39a08d052b3a8e2f0294f04153ec5c4b3f7ff01c Mon Sep 17 00:00:00 2001 From: Cris <56645054+crisng95@users.noreply.github.com> Date: Tue, 28 Jul 2026 17:26:22 +0700 Subject: [PATCH] chore(dev): remap local Redis to 6380 to coexist with host Redis The dev stack's Redis binds host port 6380 (container still 6379) so it no longer collides with a locally-running Redis on 6379. Updated the compose mapping, REDIS_URL defaults, and the dev-setup port guard accordingly. - docker-compose.yml: redis host port 6379 -> 6380 - scripts/dev-setup.sh: guard checks 6380 (the port buzz binds) - scripts/run-tests.sh, scripts/start-relay-for-tests.sh: REDIS_URL -> :6380 Co-Authored-By: Claude Opus 4.8 --- .omc/state/hud-stdin-cache.json | 1 + .../8e7824b7-ae1b-4c41-88cc-d87c8b8ad02d/hud-state.json | 6 ++++++ docker-compose.yml | 2 +- scripts/dev-setup.sh | 6 ++++-- scripts/run-tests.sh | 2 +- scripts/start-relay-for-tests.sh | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 .omc/state/hud-stdin-cache.json create mode 100644 .omc/state/sessions/8e7824b7-ae1b-4c41-88cc-d87c8b8ad02d/hud-state.json diff --git a/.omc/state/hud-stdin-cache.json b/.omc/state/hud-stdin-cache.json new file mode 100644 index 0000000000..a07f8545e8 --- /dev/null +++ b/.omc/state/hud-stdin-cache.json @@ -0,0 +1 @@ +{"session_id":"8e7824b7-ae1b-4c41-88cc-d87c8b8ad02d","transcript_path":"/Users/vy.tuong/.claude/projects/-Users-vy-tuong-Gitlab/8e7824b7-ae1b-4c41-88cc-d87c8b8ad02d.jsonl","cwd":"/Users/vy.tuong/Gitlab/buzz","prompt_id":"455146c7-a4f4-4a7c-887e-f0085b83a414","effort":{"level":"high"},"session_name":"Clone and build Buzz project","model":{"id":"claude-opus-4-8","display_name":"Opus 4.8"},"workspace":{"current_dir":"/Users/vy.tuong/Gitlab/buzz","project_dir":"/Users/vy.tuong/Gitlab","added_dirs":[]},"version":"2.1.218","output_style":{"name":"default"},"cost":{"total_cost_usd":35.163964500000006,"total_duration_ms":368275659,"total_api_duration_ms":3227248,"total_lines_added":28,"total_lines_removed":6},"context_window":{"total_input_tokens":345299,"total_output_tokens":285,"context_window_size":1000000,"current_usage":{"input_tokens":2,"output_tokens":285,"cache_creation_input_tokens":554,"cache_read_input_tokens":344743},"used_percentage":35,"remaining_percentage":65},"exceeds_200k_tokens":true,"fast_mode":false,"thinking":{"enabled":true},"rate_limits":{"five_hour":{"used_percentage":18,"resets_at":1785247200},"seven_day":{"used_percentage":3,"resets_at":1785834000}}} \ No newline at end of file diff --git a/.omc/state/sessions/8e7824b7-ae1b-4c41-88cc-d87c8b8ad02d/hud-state.json b/.omc/state/sessions/8e7824b7-ae1b-4c41-88cc-d87c8b8ad02d/hud-state.json new file mode 100644 index 0000000000..4dee40eb81 --- /dev/null +++ b/.omc/state/sessions/8e7824b7-ae1b-4c41-88cc-d87c8b8ad02d/hud-state.json @@ -0,0 +1,6 @@ +{ + "timestamp": "2026-07-24T03:28:36.067Z", + "backgroundTasks": [], + "sessionStartTimestamp": "2026-07-24T03:26:30.594Z", + "sessionId": "8e7824b7-ae1b-4c41-88cc-d87c8b8ad02d" +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0056ea6a42..635599ff72 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,7 +34,7 @@ services: image: redis:7-alpine container_name: buzz-redis ports: - - "6379:6379" + - "6380:6379" networks: - buzz-net healthcheck: diff --git a/scripts/dev-setup.sh b/scripts/dev-setup.sh index ae358517b3..3add0c1433 100755 --- a/scripts/dev-setup.sh +++ b/scripts/dev-setup.sh @@ -89,11 +89,13 @@ fail_if_local_redis_blocks_compose() { if docker ps --format '{{.Names}}' | grep -qx 'buzz-redis'; then return fi + # buzz-redis maps host port 6380 (remapped from 6379 to coexist with a local + # brew Redis serving another project). Only guard the port buzz actually binds. local redis_pids - redis_pids=$(lsof -nP -iTCP:6379 -sTCP:LISTEN 2>/dev/null | awk 'NR > 1 && $1 == "redis-ser" {print $2}' | sort -u | tr ' + redis_pids=$(lsof -nP -iTCP:6380 -sTCP:LISTEN 2>/dev/null | awk 'NR > 1 && $1 == "redis-ser" {print $2}' | sort -u | tr ' ' ' ' || true) if [[ -n "${redis_pids}" ]]; then - error "Local Redis is already listening on port 6379 (pid(s): ${redis_pids}). Stop it before running setup: brew services stop redis" + error "Local Redis is already listening on port 6380 (pid(s): ${redis_pids}). Stop it before running setup: brew services stop redis" exit 1 fi } diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh index 4dd1142801..3004d78f64 100755 --- a/scripts/run-tests.sh +++ b/scripts/run-tests.sh @@ -46,7 +46,7 @@ else export PGUSER=buzz export PGPASSWORD=buzz_dev export PGDATABASE=buzz - export REDIS_URL="redis://localhost:6379" + export REDIS_URL="redis://localhost:6380" fi # ---- Track results ---------------------------------------------------------- diff --git a/scripts/start-relay-for-tests.sh b/scripts/start-relay-for-tests.sh index 85aa101356..f54e51d1a3 100755 --- a/scripts/start-relay-for-tests.sh +++ b/scripts/start-relay-for-tests.sh @@ -153,7 +153,7 @@ fi log "Starting relay..." nohup env \ DATABASE_URL=postgres://buzz:buzz_dev@localhost:5432/buzz \ - REDIS_URL=redis://localhost:6379 \ + REDIS_URL=redis://localhost:6380 \ RELAY_URL=ws://localhost:3000 \ BUZZ_BIND_ADDR=0.0.0.0:3000 \ BUZZ_REQUIRE_AUTH_TOKEN=false \