From 4da3cff125c805e7f3cee50f36c97556594240e2 Mon Sep 17 00:00:00 2001 From: Steven Normore Date: Tue, 12 Sep 2023 11:33:47 -0400 Subject: [PATCH] Remove legacy options and CLI args (#306) --- pkg/server/options.go | 8 -------- pkg/server/server.go | 5 +---- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/pkg/server/options.go b/pkg/server/options.go index 7436cb97..e9814617 100644 --- a/pkg/server/options.go +++ b/pkg/server/options.go @@ -73,12 +73,4 @@ type Options struct { Metrics MetricsOptions `group:"Metrics Options"` Tracing TracingOptions `group:"DD APM Tracing Options"` Profiling ProfilingOptions `group:"DD APM Profiling Options" namespace:"profiling"` - - // Legacy args - StoreEnable bool `long:"store"` - FilterEnable bool `long:"filter"` - LightpushEnable bool `long:"lightpush"` - KeepHistoryDays int `long:"keep-history-days" default:"7"` - Resume bool `long:"resume"` - CleanerEnable bool `long:"cleaner.enable"` } diff --git a/pkg/server/server.go b/pkg/server/server.go index 3cd34037..321f193f 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -143,10 +143,7 @@ func New(ctx context.Context, log *zap.Logger, options Options) (*Server, error) } } - if options.StoreEnable || options.Store.Enable { - if options.CleanerEnable { - options.Store.Cleaner.Enable = true - } + if options.Store.Enable { s.db, err = createDB(options.Store.DbConnectionString, options.WaitForDB, options.Store.ReadTimeout, options.Store.WriteTimeout, options.Store.MaxOpenConns) if err != nil { return nil, errors.Wrap(err, "creating db")