Skip to content

Fix/sentry #42

Merged
merged 2 commits into from Mar 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/api/main.go
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion cmd/spider/main.go
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -14,10 +14,10 @@ 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
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
Expand Down
1 change: 1 addition & 0 deletions go.sum
Expand Up @@ -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=
Expand Down
3 changes: 2 additions & 1 deletion internal/app/spider/provide.go
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/log/sentry.go
Expand Up @@ -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"
)

Expand Down