clouddreamai-cicd-setup 1.5.41 → 1.5.43

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/templates/scripts/deploy.sh +8 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "clouddreamai-cicd-setup",
3
- "version": "1.5.41",
3
+ "version": "1.5.43",
4
4
  "description": "CloudDreamAI GitLab CI/CD 自动配置工具 - 支持 NestJS/Vue/React 项目的一键 CI/CD 配置",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/templates/scripts/deploy.sh CHANGED
@@ -399,15 +399,21 @@ create_database() {
399
399
  PG_RESTART_NEEDED=true
400
400
  fi
401
401
 
402
+ # 检查 PostgreSQL 是否有共享内存错误（测试连接）
403
+ if ! sudo -u postgres $PSQL_CMD -c "SELECT 1" >/dev/null 2>&1; then
404
+ echo "检测到 PostgreSQL 连接异常，需要重启..."
405
+ PG_RESTART_NEEDED=true
406
+ fi
407
+
402
408
  if [ "$PG_RESTART_NEEDED" = true ]; then
403
409
  # 先停掉旧容器，避免 PostgreSQL 重启后出现共享内存错误
404
410
  echo "停止旧容器（如果存在）..."
405
411
  docker container ls -q --filter "name=$APP_NAME" | xargs -r docker container stop 2>/dev/null || true
406
412
 
407
413
  echo "重启 PostgreSQL 服务..."
408
- # 宝塔 PostgreSQL 需要用 postgres 用户重启，且必须用 restart 而非 reload 才能让 listen_addresses 生效
414
+ # 宝塔 PostgreSQL 需要用 postgres 用户重启，用 immediate 模式强制立即关闭
409
415
  if [ -x "/www/server/pgsql/bin/pg_ctl" ]; then
410
- sudo -u postgres /www/server/pgsql/bin/pg_ctl restart -D /www/server/pgsql/data -m fast 2>/dev/null || true
416
+ sudo -u postgres /www/server/pgsql/bin/pg_ctl restart -D /www/server/pgsql/data -m immediate -t 10 2>&1 || true
411
417
  else
412
418
  systemctl restart postgresql 2>/dev/null || /etc/init.d/postgresql restart 2>/dev/null || true
413
419
  fi