🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Merge branch 'master' into umami-import
Edward Cuife64ea9dbbc6
diff --cc docker-compose.ymlindex cfbbaa64d,bdefc37e9..82e8a0fde--- a/docker-compose.yml+++ b/docker-compose.yml@@@ -56,18 -61,16 +61,18 @@@ servicesretries: 5start_period: 10srestart: unless-stopped+ ports:+ - "5432:5432"- redis:- image: redis:7-alpine- container_name: redis- ports:- - "6379:6379" # Exposed to internet for remote connections- volumes:- - redis-data:/data- restart: unless-stopped- command: [ "redis-server", "--requirepass", "${REDIS_PASSWORD:-changeme}", "--appendonly", "yes" ]+ # redis:+ # image: redis:7-alpine+ # container_name: redis+ # ports:- # - "127.0.0.1:6379:6379"++ # - "6379:6379" # Exposed to internet for remote connections+ # volumes:+ # - redis-data:/data+ # restart: unless-stopped- # command: ["redis-server", "--appendonly", "yes"]++ # command: [ "redis-server", "--requirepass", "${REDIS_PASSWORD:-changeme}", "--appendonly", "yes" ]backend:image: ghcr.io/rybbit-io/rybbit-backend:${IMAGE_TAG:-latest}@@@ -91,10 -94,9 +96,10 @@@- BASE_URL=${BASE_URL}- DISABLE_SIGNUP=${DISABLE_SIGNUP}- DISABLE_TELEMETRY=${DISABLE_TELEMETRY}- # Redis configuration- - REDIS_HOST=redis- - REDIS_PORT=6379- - REDIS_PASSWORD=${REDIS_PASSWORD:-changeme}+ # # Redis configuration+ # - REDIS_HOST=redis+ # - REDIS_PORT=6379++ # - REDIS_PASSWORD=${REDIS_PASSWORD:-changeme}depends_on:clickhouse:condition: service_healthydiff --cc server/src/index.tsindex 18c366d3d,9cc2b64eb..d475cc936--- a/server/src/index.ts+++ b/server/src/index.ts@@@ -441,18 -421,19 +444,20 @@@ const start = async () =>server.log.info({ axiom: true, dataset: process.env.AXIOM_DATASET }, "Axiom logging is configured");}- // Initialize uptime monitoring service in the background (non-blocking)- uptimeService- .initialize()- .then(() => {- server.log.info("Uptime monitoring service initialized successfully");- })- .catch((error) => {- server.log.error("Failed to initialize uptime service:", error);- // Continue running without uptime monitoring- });+ if (process.env.NODE_ENV === "production") {+ // Initialize uptime monitoring service in the background (non-blocking)+ uptimeService+ .initialize()+ .then(() => {+ server.log.info("Uptime monitoring service initialized successfully");+ })+ .catch((error) => {+ server.log.error("Failed to initialize uptime service:", error);+ // Continue running without uptime monitoring+ });+ }} catch (err) {+ await boss.stop();server.log.error(err);process.exit(1);}