update

Dockerfile

@@ -28,7 +28,14 @@ ENV WEBHOOK_URL=${WEBHOOK_URL} \
     QUEUE_BULL_REDIS_PORT=6379 \
     QUEUE_BULL_REDIS_DB=0 \
     N8N_QUEUE_BULL_REDIS_PREFIX=n8n:queue \
-    EXECUTIONS_MODE=queue
+    EXECUTIONS_MODE=queue \
+    # 添加 Qdrant 配置
+    QDRANT_HOST=localhost \
+    QDRANT_PORT=6333 \
+    # 添加超时配置
+    WAIT_TIMEOUT=30 \
+    # 添加日志级别
+    N8N_LOG_LEVEL=info
 
 # 安装系统依赖
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -48,12 +55,27 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     htop \
     jq \
     netcat-openbsd \
-    # 添加 Redis 安装
     redis-server \
+    # 添加 Qdrant 依赖
+    pkg-config \
+    libssl-dev \
     && ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
     && dpkg-reconfigure --frontend noninteractive tzdata \
+    # 安装 Rust
+    && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
+    && . $HOME/.cargo/env \
+    # 克隆并编译 Qdrant
+    && cd /tmp \
+    && git clone --depth 1 https://github.com/qdrant/qdrant.git \
+    && cd qdrant \
+    && cargo build --release --bin qdrant \
+    && mv target/release/qdrant /usr/local/bin/ \
+    && cd / \
+    && rm -rf /tmp/qdrant \
+    # 清理
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
+    && rm -rf $HOME/.cargo/registry \
     # 创建虚拟环境并安装 Python 依赖
     && python3 -m venv $VIRTUAL_ENV \
     && $VIRTUAL_ENV/bin/pip install --no-cache-dir --upgrade pip requests yt-dlp \
@@ -77,6 +99,7 @@ WORKDIR /home/pn/n8n
 
 # 复制启动脚本并创建数据目录
 COPY --chown=pn:pn run.sh ./run.sh
+COPY --chown=pn:pn config/n8n_env.sh ./config/n8n_env.sh
 RUN chmod +x ./run.sh \
     && mkdir -p /home/pn/.n8n \
     && chown -R pn:pn /home/pn/.n8n
@@ -91,4 +114,4 @@ USER pn
 VOLUME ["/home/pn/.n8n"]
 
 # 启动命令
-CMD ["./run.sh"]
+CMD ["./run.sh"]

config/n8n_env.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# N8N 基础配置
+export N8N_ENCRYPTION_KEY="${N8N_ENCRYPTION_KEY:-n8n8n8n}"
+export NODE_FUNCTION_ALLOW_BUILTIN=*
+export NODE_FUNCTION_ALLOW_EXTERNAL=*
+
+# 数据清理配置
+export EXECUTIONS_DATA_PRUNE=true
+export EXECUTIONS_DATA_MAX_AGE=36
+export EXECUTIONS_DATA_PRUNE_MAX_COUNT=1000
+export EXECUTIONS_DATA_SAVE_ON_ERROR=all
+export EXECUTIONS_DATA_SAVE_ON_SUCCESS=all
+export EXECUTIONS_DATA_SAVE_ON_PROGRESS=false
+export EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS=false
+
+# N8N 功能配置
+export N8N_DIAGNOSTICS_ENABLED=false
+export N8N_VERSION_NOTIFICATIONS_ENABLED=true
+export N8N_TEMPLATES_ENABLED=false
+export N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true
+
+# 性能优化配置
+export N8N_PROCESS_THREADED=true
+export N8N_METRICS_ENABLED=true
+export N8N_HIRING_BANNER_ENABLED=false
+export N8N_USER_MANAGEMENT_DISABLED=false
+export N8N_PERSONALIZATION_ENABLED=false 

run.sh

@@ -1,28 +1,43 @@
 #!/bin/bash
-set -e
+set -eo pipefail
 
 # 导入环境变量
 source /home/pn/.env
 
-current_time=$(date +"%Y-%m-%d %H:%M:%S")
-echo "Starting n8n at $current_time"
+# 错误处理函数
+handle_error() {
+    echo "错误发生在第 $1 行"
+    exit 1
+}
+trap 'handle_error $LINENO' ERR
 
-# 输出数据库配置信息
-echo "Database Configuration:"
-echo "Host: ${DB_POSTGRESDB_HOST}"
-echo "Port: ${DB_POSTGRESDB_PORT}"
-echo "User: ${DB_POSTGRESDB_USER}"
-echo "Database: ${DB_POSTGRESDB_DATABASE}"
-echo "Type: ${DB_TYPE}"
+# 超时处理函数
+timeout_handler() {
+    echo "操作超时"
+    exit 1
+}
 
-# 等待 PostgreSQL 就绪, 并输出连接信息,超时10秒
-wait_for_postgres() {
-    echo "Waiting for PostgreSQL to start..."
-    while ! nc -z ${DB_POSTGRESDB_HOST} ${DB_POSTGRESDB_PORT}; do
-        echo "Trying to connect to PostgreSQL at ${DB_POSTGRESDB_HOST}:${DB_POSTGRESDB_PORT}..."
+# 等待服务就绪的通用函数
+wait_for_service() {
+    local service=$1
+    local host=$2
+    local port=$3
+    local timeout=${4:-$WAIT_TIMEOUT}
+    
+    echo "等待 $service 就绪..."
+    local end=$((SECONDS + timeout))
+    
+    while [ $SECONDS -lt $end ]; do
+        if nc -z "$host" "$port" >/dev/null 2>&1; then
+            echo "$service 已就绪"
+            return 0
+        fi
+        echo "尝试连接 $service at $host:$port..."
         sleep 1
     done
-    echo "PostgreSQL started"
+    
+    echo "$service 启动超时"
+    exit 1
 }
 
 # 启动 Redis 服务
@@ -30,63 +45,82 @@ start_redis() {
     echo "Starting Redis server..."
     redis-server --daemonize yes
     sleep 1
-    if redis-cli ping > /dev/null 2>&1; then
-        echo "Redis server started successfully"
-    else
+    if ! redis-cli ping > /dev/null 2>&1; then
         echo "Failed to start Redis server"
         exit 1
     fi
+    
+    # 设置 Redis 配置
+    redis-cli config set maxmemory 512mb
+    redis-cli config set maxmemory-policy allkeys-lru
+    
+    echo "Redis server started successfully"
 }
 
-# 在 start_redis() 函数后添加检查函数
-check_redis_queue() {
-    echo "检查 Redis 队列状态..."
-    redis-cli info | grep connected_clients
-    redis-cli keys "${N8N_QUEUE_BULL_REDIS_PREFIX}*"
-    echo "Redis 队列键值列表："
-    redis-cli keys "*" | grep "bull"
+# 启动 Qdrant 服务
+start_qdrant() {
+    echo "Starting Qdrant server..."
+    mkdir -p /home/pn/.n8n/qdrant
+    qdrant > /home/pn/.n8n/qdrant/qdrant.log 2>&1 &
+    
+    # 等待 Qdrant 启动
+    local timeout=30
+    local end=$((SECONDS + timeout))
+    
+    while [ $SECONDS -lt $end ]; do
+        if curl -s http://localhost:6333/health >/dev/null; then
+            echo "Qdrant server started successfully"
+            return 0
+        fi
+        sleep 1
+    done
+    
+    echo "Failed to start Qdrant server"
+    exit 1
 }
 
-wait_for_postgres
-start_redis
-check_redis_queue
-
-# 设置 N8N 环境变量
-export N8N_ENCRYPTION_KEY="${N8N_ENCRYPTION_KEY:-n8n8n8n}"
-# 允许使用所有内建模块
-export NODE_FUNCTION_ALLOW_BUILTIN=*
-# 允许使用外部 npm 模块
-export NODE_FUNCTION_ALLOW_EXTERNAL=*
-# Activate automatic data pruning
-export EXECUTIONS_DATA_PRUNE=true
-# Number of hours after execution that n8n deletes data
-export EXECUTIONS_DATA_MAX_AGE=36
-# Number of executions to store
-export EXECUTIONS_DATA_PRUNE_MAX_COUNT=1000
-# Save executions ending in errors
-export EXECUTIONS_DATA_SAVE_ON_ERROR=all
-# Save successful executions
-export EXECUTIONS_DATA_SAVE_ON_SUCCESS=all
-# Don't save node progress for each execution
-export EXECUTIONS_DATA_SAVE_ON_PROGRESS=false
-# Don't save manually launched executions
-export EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS=false
-# 将以下环境变量设置为 false，以阻止 n8n 连接到其服务器
-export N8N_DIAGNOSTICS_ENABLED=false
-export N8N_VERSION_NOTIFICATIONS_ENABLED=true
-export N8N_TEMPLATES_ENABLED=false
-
-# 设置文件权限
-export N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true
+# 检查服务状态
+check_services() {
+    echo "检查服务状态..."
+    
+    # 检查 Redis
+    echo "Redis 状态："
+    redis-cli info | grep 'used_memory\|connected_clients\|total_connections_received'
+    
+    # 检查 Redis 队列
+    echo "Redis 队列状态："
+    redis-cli keys "${N8N_QUEUE_BULL_REDIS_PREFIX}*"
+    
+    # 检查 Qdrant
+    echo "Qdrant 状态："
+    curl -s http://localhost:6333/metrics
+}
 
-echo "Starting n8n with the following configuration:"
-echo "N8N_HOST: ${N8N_HOST}"
-echo "N8N_PORT: ${N8N_PORT}"
-echo "N8N_PROTOCOL: ${N8N_PROTOCOL}"
-echo "WEBHOOK_URL: ${WEBHOOK_URL}"
-echo "QUEUE_BULL_REDIS_HOST: ${QUEUE_BULL_REDIS_HOST}"
-echo "QUEUE_BULL_REDIS_PORT: ${QUEUE_BULL_REDIS_PORT}"
-echo "EXECUTIONS_MODE: ${EXECUTIONS_MODE}"
+# 主流程
+main() {
+    current_time=$(date +"%Y-%m-%d %H:%M:%S")
+    echo "Starting services at $current_time"
+    
+    # 输出配置信息
+    echo "Database Configuration:"
+    echo "Host: ${DB_POSTGRESDB_HOST}"
+    echo "Port: ${DB_POSTGRESDB_PORT}"
+    echo "User: ${DB_POSTGRESDB_USER}"
+    echo "Database: ${DB_POSTGRESDB_DATABASE}"
+    echo "Type: ${DB_TYPE}"
+    
+    # 启动服务
+    wait_for_service "PostgreSQL" "${DB_POSTGRESDB_HOST}" "${DB_POSTGRESDB_PORT}"
+    start_redis
+    start_qdrant
+    check_services
+    
+    # 设置 N8N 环境变量
+    source /home/pn/n8n/config/n8n_env.sh
+    
+    echo "Starting n8n..."
+    exec n8n start
+}
 
-# 将输出重定向到日志文件
-exec n8n start 2>&1 | tee /home/pn/.n8n/n8n.log
+# 执行主流程
+main "$@"