From 5111af692f3f9a129cb4b7099595232fb68244dd Mon Sep 17 00:00:00 2001 From: RunsTp Date: Wed, 15 Mar 2023 21:51:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[fix]=20#41=20fix=20=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/api/main.go | 3 ++- cmd/spider/main.go | 3 ++- go.mod | 1 + go.sum | 1 + internal/app/spider/provide.go | 3 ++- internal/pkg/log/sentry.go | 2 +- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cmd/api/main.go b/cmd/api/main.go index 07ada8e..097cf1f 100644 --- a/cmd/api/main.go +++ b/cmd/api/main.go @@ -33,10 +33,11 @@ func lc( randPicsCache *service.RandomPicsCache, logger *zap.Logger, client *sentry.Client, + sentryCfg *log.SentryConfig, ) { lifecycle.Append(fx.Hook{ OnStart: func(ctx context.Context) error { - *logger = *log.ModifyToSentryLogger(logger, client) + *logger = *log.ModifyToSentryLogger(logger, sentryCfg, client) return nil }, OnStop: func(ctx context.Context) error { diff --git a/cmd/spider/main.go b/cmd/spider/main.go index 236b480..1407984 100644 --- a/cmd/spider/main.go +++ b/cmd/spider/main.go @@ -35,10 +35,11 @@ func lc( shutdown fx.Shutdowner, logger *zap.Logger, client *sentry.Client, + sentryCfg *log.SentryConfig, ) { lifecycle.Append(fx.Hook{ OnStart: func(ctx context.Context) error { - *logger = *log.ModifyToSentryLogger(logger, client) + *logger = *log.ModifyToSentryLogger(logger, sentryCfg, client) return nil }, OnStop: func(ctx context.Context) error { diff --git a/go.mod b/go.mod index 4adacba..af340ed 100644 --- a/go.mod +++ b/go.mod @@ -18,6 +18,7 @@ require ( github.com/spf13/viper v1.15.0 go.uber.org/fx v1.19.2 go.uber.org/zap v1.24.0 + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gorm.io/driver/mysql v1.4.7 gorm.io/driver/postgres v1.4.8 diff --git a/go.sum b/go.sum index f03e36f..e50172b 100644 --- a/go.sum +++ b/go.sum @@ -347,6 +347,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= diff --git a/internal/app/spider/provide.go b/internal/app/spider/provide.go index 6e7debc..cf84575 100644 --- a/internal/app/spider/provide.go +++ b/internal/app/spider/provide.go @@ -5,12 +5,13 @@ import ( "vlink.dev/eoefans/internal/app/spider/health" "vlink.dev/eoefans/internal/app/spider/video_analysis" "vlink.dev/eoefans/internal/pkg/bilibili" + "vlink.dev/eoefans/internal/pkg/iversion" "vlink.dev/eoefans/internal/pkg/log" ) func Provide() fx.Option { return fx.Options( - fx.Provide(log.NewSentryConfig, log.NewSentry), + fx.Provide(iversion.NewFileVersion, log.NewSentryConfig, log.NewSentry), video_analysis.Provide(), fx.Provide(NewVideo), diff --git a/internal/pkg/log/sentry.go b/internal/pkg/log/sentry.go index a78c8bf..b6b4a96 100644 --- a/internal/pkg/log/sentry.go +++ b/internal/pkg/log/sentry.go @@ -4,10 +4,10 @@ import ( "github.com/TheZeroSlave/zapsentry" "github.com/getsentry/sentry-go" "github.com/pkg/errors" - "github.com/rogpeppe/go-internal/semver" "github.com/spf13/viper" "go.uber.org/zap" "go.uber.org/zap/zapcore" + "golang.org/x/mod/semver" "vlink.dev/eoefans/internal/pkg/iversion" ) From f92229e1fe0314105c95dd3344c5628906038607 Mon Sep 17 00:00:00 2001 From: RunsTp Date: Wed, 15 Mar 2023 21:51:56 +0800 Subject: [PATCH 2/2] [fix] go mod tidy --- go.mod | 1 - 1 file changed, 1 deletion(-) diff --git a/go.mod b/go.mod index af340ed..7c74780 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,6 @@ require ( github.com/lib/pq v1.10.7 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/errors v0.9.1 - github.com/rogpeppe/go-internal v1.8.0 github.com/spf13/viper v1.15.0 go.uber.org/fx v1.19.2 go.uber.org/zap v1.24.0