From 51f2ffd02a43d802d3f79d83e9cdabdb3edd4b50 Mon Sep 17 00:00:00 2001
From: colaftc <colaftc@gmail.com>
Date: Wed, 24 Dec 2025 23:01:20 +0800
Subject: [PATCH] giveup

---
 celerybeat-schedule-shm | Bin 32768 -> 32768 bytes
 celerybeat-schedule-wal | Bin 2958192 -> 2966432 bytes
 docker-compose.yml      |  51 ++++++++++------------------------------
 pgbouncer/pgbouncer.ini |  40 -------------------------------
 4 files changed, 13 insertions(+), 78 deletions(-)
 delete mode 100644 pgbouncer/pgbouncer.ini

diff --git a/celerybeat-schedule-shm b/celerybeat-schedule-shm
index 337592beab59eb104bd327ea813f1615136ff938..36dd64a9180d1d342ae672e34a5762ac046b5f4c 100644
GIT binary patch
delta 171
zcmZo@U}|V!s+V}A%K!oyj0_AwByfR=fq@ywKV^36py~QL@5x7_wbaF4I)CMCuRpi6
zMuk-MV8ej~$lU)(04lz*-jRFa0*=iGxJ|4!|8YIX#B`o%@<DFB&A&W=><dhr4|1EC
F003&VI;Q{t

delta 166
zcmZo@U}|V!s+V}A%K!rDj0_AwByf(2fq@yw_g-~y%_=6n)X7JqwbaF4I)}Qb=8G*q
zC_$=vu;D-gWbS_?02SX@@5sIR1h<LR<OkdwoBz0;W14)C+hFrAk8@0$FLGO$007q2
BHJbnc

diff --git a/celerybeat-schedule-wal b/celerybeat-schedule-wal
index f908bfcc604f6b88dc562ad6c9cb45287ff16e95..b79331f270b5696e5c24e500c2d00514f4e33f9f 100644
GIT binary patch
delta 188
zcmV;t07L)q#<T&ThqVEKgaL#Cgad>Ggaw2Kga?EOgb9QSgbRcWgbjoagb#!egb{=i
zgcF1mgcXDqgcpPugc*bygd2n$gdKz)gdc<;gdv0?gd>C`ge8O~geQb3gein7ge!zB
zv@LKWlW^e>2yHkr`G(x`Z?{O8CASO#J-1-)E7bv)1rjZ_4>te+040=Y7KW5klubMY
qm$@<mzX-v~Hp)wWuQj(Yh$Ze15<L(DA_8Auc4cyNX>V>{Uku#5bV0iS

delta 101
zcmV~$*%84|006*wi2FX{4sk{3O$k1BMjMKV7Sy8zyYJU0{Juqa3QEc<B2_hY4NWa=
n9bG+r14AQY6H_y>xrL>bwT-RB&R*)^=;Z7obCtUl_ec5%uo584

diff --git a/docker-compose.yml b/docker-compose.yml
index d30f6c0..f4ad351 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,12 +12,6 @@ services:
       - "5432:5432"
     volumes:
       - db_data:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
-      interval: 5s
-      timeout: 3s
-      retries: 5
-      start_period: 10s
     restart: unless-stopped
 
   pgbouncer:
@@ -46,15 +40,8 @@ services:
       PGBOUNCER_LOG_POOLER_ERRORS: "1"
     ports:
       - "6432:6432"
-    healthcheck:
-      test: ["CMD-SHELL", "timeout 1 bash -c '</dev/tcp/localhost/6432' || exit 1"]
-      interval: 5s
-      timeout: 3s
-      retries: 5
-      start_period: 15s
     depends_on:
-      postgres:
-        condition: service_healthy
+      - postgres
     restart: unless-stopped
 
   pgadmin:
@@ -117,14 +104,10 @@ services:
       DB_USER: postgres
       DB_PASSWORD: postgres
     depends_on:
-      pgbouncer:
-        condition: service_healthy
-      postgres:
-        condition: service_healthy
-      redis:
-        condition: service_started
-      rabbitmq:
-        condition: service_started
+      - pgbouncer
+      - postgres
+      - redis
+      - rabbitmq
     restart: unless-stopped
 
   celery_worker:
@@ -153,14 +136,10 @@ services:
       DB_USER: postgres
       DB_PASSWORD: postgres
     depends_on:
-      pgbouncer:
-        condition: service_healthy
-      postgres:
-        condition: service_healthy
-      redis:
-        condition: service_started
-      rabbitmq:
-        condition: service_started
+      - pgbouncer
+      - postgres
+      - redis
+      - rabbitmq
     restart: unless-stopped
 
   celery_beat:
@@ -188,14 +167,10 @@ services:
       CELERY_BROKER_URL: amqp://guest:guest@rabbitmq:5672//
       CELERY_RESULT_BACKEND: redis://redis:6379/0
     depends_on:
-      pgbouncer:
-        condition: service_healthy
-      postgres:
-        condition: service_healthy
-      redis:
-        condition: service_started
-      rabbitmq:
-        condition: service_started
+      - pgbouncer
+      - postgres
+      - redis
+      - rabbitmq
     restart: unless-stopped
 
 volumes:
diff --git a/pgbouncer/pgbouncer.ini b/pgbouncer/pgbouncer.ini
deleted file mode 100644
index 5db9936..0000000
--- a/pgbouncer/pgbouncer.ini
+++ /dev/null
@@ -1,40 +0,0 @@
-[databases]
-; 数据库配置将通过环境变量 DATABASES_* 自动生成
-; 如果环境变量未设置，可以在这里手动配置：
-; flower = host=postgres port=5432 dbname=flower
-
-[pgbouncer]
-; 监听地址和端口
-listen_addr = 0.0.0.0
-listen_port = 6432
-
-; 认证方式：trust 表示信任所有连接（适用于容器内部网络）
-; 生产环境建议使用 md5 或 scram-sha-256
-auth_type = trust
-
-; 连接池配置
-; pool_mode: session, transaction, statement
-; transaction 模式最适合 Django，每个事务结束后释放连接
-pool_mode = transaction
-max_client_conn = 100
-default_pool_size = 25
-min_pool_size = 5
-reserve_pool_size = 5
-reserve_pool_timeout = 3
-
-; 连接超时设置
-server_connect_timeout = 15
-server_idle_timeout = 600
-query_timeout = 0
-query_wait_timeout = 120
-
-; 日志配置
-log_connections = 1
-log_disconnections = 1
-log_pooler_errors = 1
-
-; 其他设置
-; 忽略 PostgreSQL 16 的额外启动参数
-ignore_startup_parameters = extra_float_digits
-application_name_add_host = 1
-