fix(docker): 修正数据库连接和迁移配置
- 更新docker-compose中migrate命令参数,改为使用目录方式管理迁移文件 - 修改spider服务环境变量,切换为单独的数据库连接配置前缀 - main.go中调整服务名称拼接逻辑,追加环境变量中的OTEL服务名称 - 删除main.go中OTel配置中的注释认证头部代码,提高配置清晰度
This commit is contained in:
@@ -6,15 +6,12 @@ services:
|
||||
- all
|
||||
- migrate
|
||||
command:
|
||||
- "schema"
|
||||
- "migrate"
|
||||
- "apply"
|
||||
- "--url"
|
||||
- "mysql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}"
|
||||
- "--to"
|
||||
- "file://schema.sql"
|
||||
- "--dev-url"
|
||||
- "mysql://${DB_USER_DEV}:${DB_PASSWORD_DEV}@${DB_HOST}:${DB_PORT}/${DB_NAME_DEV}"
|
||||
- "--auto-approve"
|
||||
- "--dir"
|
||||
- "file://migrations"
|
||||
- "--baseline"
|
||||
- "20251213191759"
|
||||
restart: "no"
|
||||
@@ -155,11 +152,11 @@ services:
|
||||
- spider
|
||||
- all
|
||||
environment:
|
||||
DB_HOST: ${DB_HOST}
|
||||
DB_PORT: ${DB_PORT}
|
||||
DB_NAME: ${DB_NAME}
|
||||
DB_USER: ${DB_USER}
|
||||
DB_PASSWORD: ${DB_PASSWORD}
|
||||
DB_HOST: ${DB_SPIDER_HOST}
|
||||
DB_PORT: ${DB_SPIDER_PORT}
|
||||
DB_NAME: ${DB_SPIDER_NAME}
|
||||
DB_USER: ${DB_SPIDER_USER}
|
||||
DB_PASSWORD: ${DB_SPIDER_PASSWORD}
|
||||
DB_POOL_SIZE: 20
|
||||
DB_MAX_OVERFLOW: 50
|
||||
OTEL_SERVICE_NAME: ${OTEL_SERVICE_NAME}
|
||||
|
||||
8
main.go
8
main.go
@@ -17,14 +17,14 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
serviceName = "后台服务"
|
||||
serviceName = "后台服务——"
|
||||
)
|
||||
|
||||
func main() {
|
||||
// 从环境变量获取OTEL服务名称,如果不存在则使用默认值
|
||||
otelServiceName := genv.Get("OTEL_SERVICE_NAME")
|
||||
if !otelServiceName.IsNil() {
|
||||
serviceName = otelServiceName.String()
|
||||
serviceName += otelServiceName.String()
|
||||
}
|
||||
|
||||
// 从环境变量获取OTEL收集器地址,如果不存在则使用默认值
|
||||
@@ -38,10 +38,6 @@ func main() {
|
||||
config.ServiceName = serviceName
|
||||
config.CollectorURL = collectorURL
|
||||
config.Insecure = true // 根据实际环境调整
|
||||
//config.Headers = map[string]string{
|
||||
// "x-service-token": "your-token-here", // 如果需要认证token
|
||||
//}
|
||||
|
||||
if err := otel.InitWithConfig(config); err != nil {
|
||||
glog.Fatal(gctx.GetInitCtx(), "OTel初始化失败", err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user