mirror of
https://github.com/ThearchyHelios/AgentLab.git
synced 2026-11-17 02:52:00 +00:00
配置模板补上 PostgreSQL 和多进程的几项:.env.example 的应用库一节分成应用库、连接池、PgBouncer、多进程、开发用 PostgreSQL 五组,补上 AGENTLAB_DATABASE_DIRECT_URL、AGENTLAB_DB_PGBOUNCER、AGENTLAB_DB_POOL_TIMEOUT、AGENTLAB_DB_POOL_RECYCLE、AGENTLAB_DB_STARTUP_TIMEOUT、AGENTLAB_WORKERS、AGENTLAB_WORKER_LEASE_S、AGENTLAB_WORKER_HEARTBEAT_S、AGENTLAB_SCHEDULER、AGENTLAB_SCHEDULER_TICK_S、AGENTLAB_BUILD 和 dev.sh --postgres 的 AGENTLAB_DEV_PG_*(都注释着,名字、缺省值照 core/config.py 和脚本);dev.sh 的 AGENTLAB_DEV_PG_* 也认 .env / backend/.env(环境变量优先,和后端的配置同一个规矩,不 source)。deploy/agentlab.env 末尾再追加「外接 PostgreSQL 与多进程(可选)」一段(地址写宿主机网桥 172.17.0.1、放行容器网段,和内置库二选一;断点库、PgBouncer、直连地址、工作进程、租约、连接池、启动时等库),已有的行一行没动。deploy.sh:AGENTLAB_DATABASE_DIRECT_URL 也算外接的库(和内置互斥),只设直连地址不设 AGENTLAB_DATABASE_URL、内置库开 AGENTLAB_DB_PGBOUNCER、SQLite 时 AGENTLAB_WORKERS 大于 1 都在起容器之前照实拦下(migrate-to-postgres 在停服务之前查)。单测:这些 AGENTLAB_* 经 --env-file 进容器、几条拦截、模板两段的项和缺省值、dev.sh 从 .env 读设置,以及守卫——config.py 里应用库、连接池、多进程、调度几类配置每一项都要在 .env.example 里有
This commit is contained in:
+35
-5
@@ -13,7 +13,8 @@ usage() {
|
||||
--postgres 应用库用 PostgreSQL:起(已经有就复用)一个本地开发用的 PostgreSQL 容器,端口只开在 127.0.0.1,
|
||||
后端照它设 AGENTLAB_DATABASE_URL。密码第一次自动生成,在 data/.postgres-dev/ 里;库的数据在 docker
|
||||
数据卷里,Ctrl-C 只停前后端,库的容器留着下次复用(不要了:docker rm -f 容器名 && docker volume rm 卷名)。
|
||||
不加就和原来一样:SQLite,不用 docker。下面几个环境变量可以改缺省:
|
||||
不加就和原来一样:SQLite,不用 docker。下面几项可以改缺省(环境变量,或者写在 .env / backend/.env 里,
|
||||
环境变量优先):
|
||||
AGENTLAB_DEV_PG_CONTAINER 容器名,缺省 agentlab-dev-postgres
|
||||
AGENTLAB_DEV_PG_PORT 本机端口,缺省 55432
|
||||
AGENTLAB_DEV_PG_VOLUME 数据卷,缺省 agentlab-dev-pgdata
|
||||
@@ -72,11 +73,40 @@ fi
|
||||
export AGENTLAB_PORT="$API_PORT"
|
||||
|
||||
# ---- --postgres:本地开发用的 PostgreSQL ----
|
||||
# 这几项(AGENTLAB_DEV_PG_*)只有这个脚本用。和后端的配置一样认 .env:环境变量 > backend/.env > .env > 缺省(后端的 settings
|
||||
# 读这两个文件,后一个优先)。不 source:.env 是给后端按 KEY=VALUE 读的,不是 shell(值里的 $、空格、反引号不该被执行)
|
||||
dotenv_value() {
|
||||
local key="$1" file line val="" found=""
|
||||
for file in "$ROOT/.env" "$ROOT/backend/.env"; do
|
||||
[ -f "$file" ] || continue
|
||||
while IFS= read -r line || [ -n "$line" ]; do
|
||||
line="${line%$'\r'}"
|
||||
line="${line#"${line%%[![:space:]]*}"}"
|
||||
line="${line#export }"
|
||||
case "$line" in
|
||||
"$key="*) val="${line#*=}"; found=1 ;;
|
||||
esac
|
||||
done < "$file"
|
||||
done
|
||||
[ -n "$found" ] || return 1
|
||||
val="${val%"${val##*[![:space:]]}"}"
|
||||
case "$val" in
|
||||
\"*\"|\'*\') val="${val:1:${#val}-2}" ;;
|
||||
*) val="${val%%[[:space:]]#*}"; val="${val%"${val##*[![:space:]]}"}" ;;
|
||||
esac
|
||||
printf '%s' "$val"
|
||||
}
|
||||
dev_pg_setting() {
|
||||
local value
|
||||
value="$(printenv "$1" 2>/dev/null || true)"
|
||||
[ -n "$value" ] || value="$(dotenv_value "$1" || true)"
|
||||
printf '%s' "${value:-$2}"
|
||||
}
|
||||
if [ -n "$WITH_PG" ]; then
|
||||
PG_CONTAINER="${AGENTLAB_DEV_PG_CONTAINER:-agentlab-dev-postgres}"
|
||||
PG_PORT="${AGENTLAB_DEV_PG_PORT:-55432}"
|
||||
PG_VOLUME="${AGENTLAB_DEV_PG_VOLUME:-agentlab-dev-pgdata}"
|
||||
PG_IMAGE="${AGENTLAB_DEV_PG_IMAGE:-postgres:16}"
|
||||
PG_CONTAINER="$(dev_pg_setting AGENTLAB_DEV_PG_CONTAINER agentlab-dev-postgres)"
|
||||
PG_PORT="$(dev_pg_setting AGENTLAB_DEV_PG_PORT 55432)"
|
||||
PG_VOLUME="$(dev_pg_setting AGENTLAB_DEV_PG_VOLUME agentlab-dev-pgdata)"
|
||||
PG_IMAGE="$(dev_pg_setting AGENTLAB_DEV_PG_IMAGE postgres:16)"
|
||||
DEV_DATA="${AGENTLAB_DATA_DIR:-$ROOT/data}"
|
||||
case "$PG_PORT" in ''|*[!0-9]*) echo "AGENTLAB_DEV_PG_PORT 要是端口号:$PG_PORT"; exit 2 ;; esac
|
||||
command -v docker >/dev/null || { echo "--postgres 要用 docker,没找到它"; exit 1; }
|
||||
|
||||
Reference in New Issue
Block a user