Update start.sh

start.sh

@@ -1,59 +1,60 @@
 #!/usr/bin/env bash
 set -e
 
-echo "======================================"
-echo "PostgreSQL + Adminer for Hugging Face"
-echo "======================================"
+log() {
+  echo "[$(date -u +'%Y-%m-%dT%H:%M:%SZ')] $*"
+}
+
+log "======================================"
+log "PostgreSQL General HF Space starting"
+log "======================================"
 
 if [ -z "$POSTGRES_PASSWORD" ]; then
-  echo "ERROR: POSTGRES_PASSWORD is not set."
-  echo "Please set POSTGRES_PASSWORD in Hugging Face Space Secrets."
+  log "ERROR: POSTGRES_PASSWORD is not set."
+  log "Please set POSTGRES_PASSWORD in Hugging Face Space Secrets."
   exit 1
 fi
 
 export POSTGRES_USER="${POSTGRES_USER:-admin}"
 export POSTGRES_DB="${POSTGRES_DB:-appdb}"
 
-# PostgreSQL 运行数据目录：建议使用 Space 本地磁盘
+# PostgreSQL runtime data directory: use Space local disk.
 export PGDATA="${PGDATA:-/home/user/pgdata}"
 
-# 挂载大磁盘目录：用于备份、用户文件、导出文件、生成文件
+# Mounted storage bucket directories.
 export DATA_DIR="${DATA_DIR:-/data}"
 export BACKUP_DIR="${BACKUP_DIR:-/data/backups}"
 export USER_FILE_DIR="${USER_FILE_DIR:-/data/files}"
 export EXPORT_DIR="${EXPORT_DIR:-/data/exports}"
 export GENERATED_DIR="${GENERATED_DIR:-/data/generated}"
 
-# 自动备份间隔，默认 1 小时
+# Automatic backup interval, default: 1 hour.
 export BACKUP_INTERVAL_SECONDS="${BACKUP_INTERVAL_SECONDS:-3600}"
 
-echo "Runtime configuration:"
-echo "POSTGRES_USER=$POSTGRES_USER"
-echo "POSTGRES_DB=$POSTGRES_DB"
-echo "PGDATA=$PGDATA"
-echo "DATA_DIR=$DATA_DIR"
-echo "BACKUP_DIR=$BACKUP_DIR"
-echo "USER_FILE_DIR=$USER_FILE_DIR"
-echo "EXPORT_DIR=$EXPORT_DIR"
-echo "GENERATED_DIR=$GENERATED_DIR"
-echo "BACKUP_INTERVAL_SECONDS=$BACKUP_INTERVAL_SECONDS"
-
-echo "Creating directories..."
-
+log "Runtime configuration:"
+log "POSTGRES_USER=$POSTGRES_USER"
+log "POSTGRES_DB=$POSTGRES_DB"
+log "PGDATA=$PGDATA"
+log "DATA_DIR=$DATA_DIR"
+log "BACKUP_DIR=$BACKUP_DIR"
+log "USER_FILE_DIR=$USER_FILE_DIR"
+log "EXPORT_DIR=$EXPORT_DIR"
+log "GENERATED_DIR=$GENERATED_DIR"
+log "BACKUP_INTERVAL_SECONDS=$BACKUP_INTERVAL_SECONDS"
+
+log "Creating directories..."
 mkdir -p "$PGDATA"
 mkdir -p "$BACKUP_DIR"
 mkdir -p "$USER_FILE_DIR"
 mkdir -p "$EXPORT_DIR"
 mkdir -p "$GENERATED_DIR"
 
-# PostgreSQL 数据目录需要 postgres 用户权限
+# PostgreSQL needs a private data directory. Allow permission changes to fail on restricted runtimes.
 chown -R postgres:postgres "$PGDATA" || true
 chmod 700 "$PGDATA" || true
-
-# /data 是挂载大磁盘，可能不支持 chown，这里只尽量设置权限，允许失败
 chmod -R 755 "$DATA_DIR" || true
 
-echo "Directory status:"
+log "Directory status:"
 ls -ld "$PGDATA" || true
 ls -ld "$DATA_DIR" || true
 ls -ld "$BACKUP_DIR" || true
@@ -64,46 +65,40 @@ ls -ld "$GENERATED_DIR" || true
 RESTORE_BACKUP=0
 
 if [ ! -s "$PGDATA/PG_VERSION" ]; then
-  echo "No existing PostgreSQL data directory found."
-
+  log "No existing PostgreSQL data directory found."
   if [ -f "$BACKUP_DIR/latest.sql" ]; then
-    echo "Backup file found: $BACKUP_DIR/latest.sql"
-    echo "Database will be restored after PostgreSQL initialization."
+    log "Backup file found: $BACKUP_DIR/latest.sql"
+    log "Database will be restored after PostgreSQL initialization."
     RESTORE_BACKUP=1
   else
-    echo "No backup file found. A new database will be initialized."
+    log "No backup file found. A new database will be initialized."
   fi
 else
-  echo "Existing PostgreSQL data directory found."
+  log "Existing PostgreSQL data directory found."
 fi
 
-echo "Starting PostgreSQL..."
-
+log "Starting PostgreSQL..."
 docker-entrypoint.sh postgres &
-
 POSTGRES_PID=$!
 
-echo "Waiting for PostgreSQL to become ready..."
-
+log "Waiting for PostgreSQL to become ready..."
 until pg_isready -h 127.0.0.1 -p 5432 -U "$POSTGRES_USER"; do
   sleep 2
 done
 
-echo "PostgreSQL is ready."
+log "PostgreSQL is ready."
 
 if [ "$RESTORE_BACKUP" = "1" ]; then
-  echo "Restoring database from $BACKUP_DIR/latest.sql ..."
-
+  log "Restoring database from $BACKUP_DIR/latest.sql ..."
   PGPASSWORD="$POSTGRES_PASSWORD" psql \
     -h 127.0.0.1 \
     -p 5432 \
     -U "$POSTGRES_USER" \
     -d "$POSTGRES_DB" \
     < "$BACKUP_DIR/latest.sql" || {
-      echo "WARNING: Restore failed. Please check backup file."
+      log "WARNING: Restore failed. Please check backup file."
     }
-
-  echo "Restore process finished."
+  log "Restore process finished."
 fi
 
 create_backup() {
@@ -111,7 +106,7 @@ create_backup() {
   BACKUP_FILE="$BACKUP_DIR/backup_${POSTGRES_DB}_${TIMESTAMP}.sql"
   LATEST_FILE="$BACKUP_DIR/latest.sql"
 
-  echo "Creating backup: $BACKUP_FILE"
+  log "Creating backup: $BACKUP_FILE"
 
   PGPASSWORD="$POSTGRES_PASSWORD" pg_dump \
     -h 127.0.0.1 \
@@ -123,52 +118,38 @@ create_backup() {
   mv "$BACKUP_FILE.tmp" "$BACKUP_FILE"
   cp "$BACKUP_FILE" "$LATEST_FILE"
 
-  echo "Backup saved:"
-  echo "- $BACKUP_FILE"
-  echo "- $LATEST_FILE"
+  log "Backup saved: $BACKUP_FILE and $LATEST_FILE"
 }
 
 backup_loop() {
-  echo "Backup loop started. Interval: ${BACKUP_INTERVAL_SECONDS}s"
-
+  log "Backup loop started. Interval: ${BACKUP_INTERVAL_SECONDS}s"
   while true; do
     sleep "$BACKUP_INTERVAL_SECONDS"
-
     if pg_isready -h 127.0.0.1 -p 5432 -U "$POSTGRES_USER"; then
-      create_backup || echo "WARNING: Backup failed."
+      create_backup || log "WARNING: Backup failed."
     else
-      echo "WARNING: PostgreSQL is not ready. Backup skipped."
+      log "WARNING: PostgreSQL is not ready. Backup skipped."
     fi
   done
 }
 
-# 启动后先做一次备份，避免 latest.sql 长时间不存在
 if pg_isready -h 127.0.0.1 -p 5432 -U "$POSTGRES_USER"; then
-  create_backup || echo "WARNING: Initial backup failed."
+  create_backup || log "WARNING: Initial backup failed."
 fi
 
 backup_loop &
 
-echo "Checking PHP modules..."
-
+log "Checking PHP PostgreSQL extension for optional Adminer usage..."
 if php -m | grep -Ei "pgsql|pdo_pgsql" > /dev/null; then
-  echo "PHP PostgreSQL extension loaded."
+  log "PHP PostgreSQL extension loaded."
 else
-  echo "ERROR: PHP PostgreSQL extension is not loaded."
-  echo "Installed PHP modules:"
-  php -m
-  echo ""
-  echo "Please make sure Dockerfile installs php-pgsql."
-  exit 1
+  log "WARNING: PHP PostgreSQL extension is not loaded. Adminer may not work."
 fi
 
-echo "Starting Adminer on port 7860..."
-echo "Adminer login information:"
-echo "System: PostgreSQL"
-echo "Server: 127.0.0.1"
-echo "Username: $POSTGRES_USER"
-echo "Database: $POSTGRES_DB"
+log "Starting FastAPI on port 7860..."
+log "API docs: /docs"
+log "Health: /api/health"
 
-php -S 0.0.0.0:7860 /adminer.php
+uvicorn api:app --host 0.0.0.0 --port 7860
 
 wait "$POSTGRES_PID"