Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions infra/docker/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ KAFKA_IMAGE_NAME=confluentinc/cp-kafka:7.7.0
POSTGRES_IMAGE_NAME=ankane/pgvector:v0.5.1
# OTEL collector image vars removed — HOL-21 dropped the collector container.
# Backend hosts the OTLP receiver at /otel/v1/{logs,traces,metrics}.
REDIS_IMAGE_NAME=redis:8.0.2
ZOOKEEPER_IMAGE_NAME=confluentinc/cp-zookeeper:7.7.0

# ── ClickHouse (analytics) ──────────────────────────────────────────
Expand All @@ -45,7 +44,7 @@ KAFKA_SERVERS=kafka:9092
KAFKA_TOPIC=dev

# ── Redis ───────────────────────────────────────────────────────────
REDIS_PASSWORD=redispassword
# Removed in HOL-22 — backend uses IMemoryCache + Postgres instead.

# ── Frontend / API URLs ─────────────────────────────────────────────
REACT_APP_DISABLE_ANALYTICS=false
Expand Down
1 change: 0 additions & 1 deletion infra/docker/compose.hobby-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ services:
- ClickHouse__Password=${CLICKHOUSE_PASSWORD:-}
- ClickHouse__Migrations__Path=/app/clickhouse-migrations
- ClickHouse__Migrations__Disabled=${CLICKHOUSE_MIGRATIONS_DISABLED:-false}
- Redis__Configuration=${REDIS_ADDRESS:-redis:6379}
- Kafka__BootstrapServers=${KAFKA_SERVERS:-kafka:9092}
- Storage__Type=filesystem
- Storage__FilesystemRoot=/highlight-data
Expand Down
19 changes: 3 additions & 16 deletions infra/docker/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,9 @@ services:
KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181'

redis:
logging: *local-logging
container_name: redis
image: ${REDIS_IMAGE_NAME}
restart: on-failure
environment:
REDIS_PASSWORD: ${REDIS_PASSWORD}
volumes:
- redis-data:/data
ports:
- '0.0.0.0:6379:6379'
command:
- redis-server
- --save 60 1
- --loglevel warning
# Redis removed in HOL-22 — RedisService was registered in DI but no
# code path actually injected it. Self-hosted scale doesn't need a
# separate cache layer; .NET's IMemoryCache + Postgres cover it.

postgres:
logging: *local-logging
Expand Down Expand Up @@ -100,7 +88,6 @@ volumes:
postgres-data:
clickhouse-data:
clickhouse-logs:
redis-data:
kafka-data:
zoo-log:
zoo-data:
2 changes: 0 additions & 2 deletions infra/docker/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ if [[ "$*" == *"--go-docker"* ]]; then
export OTLP_DOGFOOD_ENDPOINT=http://backend:8082/otel
export OTLP_ENDPOINT=http://backend:8082/otel
export PSQL_HOST=postgres
export REDIS_EVENTS_STAGING_ENDPOINT=redis:6379
echo "Using docker-internal infra."
else
export CLICKHOUSE_ADDRESS=localhost:9000
Expand All @@ -42,7 +41,6 @@ else
export OTLP_DOGFOOD_ENDPOINT=http://localhost:8082/otel
export OTLP_ENDPOINT=http://localhost:8082/otel
export PSQL_HOST=localhost
export REDIS_EVENTS_STAGING_ENDPOINT=localhost:6379
fi

# setup path to include go installed binaries
Expand Down
6 changes: 0 additions & 6 deletions src/dotnet/src/HoldFast.Api/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
using HoldFast.Shared.Kafka;
using HoldFast.Shared.Runtime;
using HoldFast.Shared.SessionProcessing;
using HoldFast.Shared.Redis;
using HoldFast.Storage;
using HoldFast.Worker;
using Microsoft.EntityFrameworkCore;
Expand Down Expand Up @@ -152,11 +151,6 @@ req.RequestUri is null ||
builder.Configuration.GetSection("Kafka:TopicBootstrap"));
builder.Services.AddHostedService<KafkaTopicBootstrapService>();

// ── Redis ─────────────────────────────────────────────────────────────
builder.Services.Configure<RedisOptions>(
builder.Configuration.GetSection("Redis"));
builder.Services.AddSingleton<RedisService>();

// ── ClickHouse ────────────────────────────────────────────────────────
builder.Services.Configure<ClickHouseOptions>(
builder.Configuration.GetSection("ClickHouse"));
Expand Down
1 change: 0 additions & 1 deletion src/dotnet/src/HoldFast.Shared/HoldFast.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
<PackageReference Include="StackExchange.Redis" Version="2.12.4" />
</ItemGroup>

<ItemGroup>
Expand Down
71 changes: 0 additions & 71 deletions src/dotnet/src/HoldFast.Shared/Redis/RedisService.cs

This file was deleted.

64 changes: 0 additions & 64 deletions src/dotnet/tests/HoldFast.Shared.Tests/Redis/RedisOptionsTests.cs

This file was deleted.

Loading