Update run.sh

run.sh

@@ -50,10 +50,8 @@ start_redis() {
         exit 1
     fi
     
-    # 设置 Redis 配置
     redis-cli config set maxmemory 512mb
     redis-cli config set maxmemory-policy allkeys-lru
-    echo ""
     echo "Redis server started successfully"
     echo ""
 }
@@ -62,17 +60,10 @@ start_redis() {
 start_qdrant() {
     echo "Starting Qdrant server..."
     
-    # 确保目录存在并有正确的权限
-    mkdir -p /home/pn/.n8n/qdrant/storage
-    mkdir -p /home/pn/.n8n/qdrant/config
-    mkdir -p /home/pn/.n8n/qdrant/snapshots
-    mkdir -p /home/pn/.n8n/qdrant/logs
-    
-    # 设置正确的权限
+    mkdir -p /home/pn/.n8n/qdrant/{storage,config,snapshots,logs}
     chmod -R 755 /home/pn/.n8n/qdrant
     chown -R pn:pn /home/pn/.n8n/qdrant
-    
-    # 创建 Qdrant 配置文件
+
     cat > /home/pn/.n8n/qdrant/config/config.yaml <<EOF
 service:
   host: 0.0.0.0
@@ -116,24 +107,19 @@ logger:
 telemetry_disabled: true
 EOF
 
-    # 确保配置文件有正确的权限
     chmod 644 /home/pn/.n8n/qdrant/config/config.yaml
-    
-    # 使用配置文件启动 Qdrant
+
     qdrant --config-path /home/pn/.n8n/qdrant/config/config.yaml > /home/pn/.n8n/qdrant/logs/startup.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"
-            
-            # 预创建常用集合
+
             echo "Creating default collections..."
-            
-            # 创建文本向量集合 (768维，适用于多数文本嵌入模型)
+
             curl -X PUT 'http://localhost:6333/collections/text_vectors' \
                 -H 'Content-Type: application/json' \
                 -d '{
@@ -141,84 +127,45 @@ EOF
                         "size": 768,
                         "distance": "Cosine",
                         "on_disk": true
-                    },
-                    "optimizers_config": {
-                        "default_segment_number": 2,
-                        "indexing_threshold": 20000,
-                        "memmap_threshold": 10000
-                    },
-                    "hnsw_config": {
-                        "m": 16,
-                        "ef_construct": 100,
-                        "full_scan_threshold": 10000,
-                        "max_indexing_threads": 0,
-                        "on_disk": true
-                    },
-                    "init_from": {
-                        "collection_name": "text_vectors"
                     }
                 }'
-            
-            # 创建图像向量集合 (512维，适用于多数图像嵌入模型)
+
             curl -X PUT 'http://localhost:6333/collections/image_vectors' \
                 -H 'Content-Type: application/json' \
                 -d '{
                     "vectors": {
                         "size": 512,
                         "distance": "Cosine"
-                    },
-                    "optimizers_config": {
-                        "default_segment_number": 2,
-                        "indexing_threshold": 20000
-                    },
-                    "hnsw_config": {
-                        "m": 16,
-                        "ef_construct": 100,
-                        "full_scan_threshold": 10000
                     }
                 }'
-            
-            # 创建通用向量集合 (1536维，适用于 OpenAI 的嵌入模型)
+
             curl -X PUT 'http://localhost:6333/collections/openai_vectors' \
                 -H 'Content-Type: application/json' \
                 -d '{
                     "vectors": {
                         "size": 1536,
                         "distance": "Cosine"
-                    },
-                    "optimizers_config": {
-                        "default_segment_number": 2,
-                        "indexing_threshold": 20000
-                    },
-                    "hnsw_config": {
-                        "m": 16,
-                        "ef_construct": 100,
-                        "full_scan_threshold": 10000
                     }
                 }'
-                
-            # 验证集合创建状态并输出详细信息
+
             echo -e "\nVerifying collections:"
             curl -s 'http://localhost:6333/collections' | jq '.'
-            
-            # 测试连接
+
             echo -e "\nTesting Qdrant connection:"
             curl -v http://localhost:6333/health
-            
             return 0
         fi
+
         echo "Waiting for Qdrant to start..."
         sleep 1
-        
-        # 检查是否有错误日志
+
         if grep -i "error" /home/pn/.n8n/qdrant/logs/startup.log >/dev/null 2>&1; then
             echo "Error found in Qdrant logs:"
             tail -n 10 /home/pn/.n8n/qdrant/logs/startup.log
         fi
     done
-    
+
     echo "Failed to start Qdrant server"
-    echo "Last 10 lines of Qdrant log:"
     tail -n 10 /home/pn/.n8n/qdrant/logs/startup.log
     exit 1
 }
@@ -226,18 +173,14 @@ EOF
 # 检查服务状态
 check_services() {
     echo "检查服务状态..."
-    
-    # 检查 Redis
+
     echo "Redis 状态："
     redis-cli info | grep 'used_memory\|connected_clients\|total_connections_received'
-       
-    # 检查 Qdrant
+
     echo "Qdrant 状态："
     if curl -s http://localhost:6333/metrics >/dev/null; then
         echo "Qdrant 运行正常"
         curl -s http://localhost:6333/metrics
-        
-        # 显示集合信息
         echo "Qdrant 集合列表："
         curl -s http://localhost:6333/collections
     else
@@ -249,32 +192,34 @@ check_services() {
 # 主流程
 main() {
     current_time=$(date +"%Y-%m-%d %H:%M:%S")
-    echo "Starting services at $current_time"
-    
-    # 输出配置信息
+    echo "===== Application Startup 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}"
+
+    if [[ "$DB_TYPE" == "postgresdb" ]]; then
+        echo "Host: ${DB_POSTGRESDB_HOST}"
+        echo "Port: ${DB_POSTGRESDB_PORT}"
+        echo "User: ${DB_POSTGRESDB_USER}"
+        echo "Database: ${DB_POSTGRESDB_DATABASE}"
+        wait_for_service "PostgreSQL" "${DB_POSTGRESDB_HOST}" "${DB_POSTGRESDB_PORT}"
+    fi
+
     echo ""
     start_redis
     echo ""
     start_qdrant
     echo ""
     check_services
-    
-    # 设置 N8N 环境变量
-    source /home/pn/n8n/config/n8n_env.sh
-    
+
+    # 加载额外 n8n 环境变量（可选）
+    if [ -f /home/pn/n8n/config/n8n_env.sh ]; then
+        source /home/pn/n8n/config/n8n_env.sh
+    fi
+
     echo ""
     echo "Starting n8n..."
     exec n8n start
 }
 
-# 执行主流程
 main "$@"