From 03c3189c0281971bf6d2901f2e5bdb9456d8bb6b Mon Sep 17 00:00:00 2001 From: Masahiro Fujimura Date: Wed, 26 Jun 2019 21:21:17 +0900 Subject: [PATCH] Changes don't required config.toml in server mode (#853) --- commands/server.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/commands/server.go b/commands/server.go index 930e67a3..24921cde 100644 --- a/commands/server.go +++ b/commands/server.go @@ -94,8 +94,7 @@ func (p *ServerCmd) SetFlags(f *flag.FlagSet) { f.BoolVar(&c.Conf.DebugSQL, "debug-sql", false, "SQL debug mode") wd, _ := os.Getwd() - defaultConfPath := filepath.Join(wd, "config.toml") - f.StringVar(&p.configPath, "config", defaultConfPath, "/path/to/toml") + f.StringVar(&p.configPath, "config", "", "/path/to/toml") defaultResultsDir := filepath.Join(wd, "results") f.StringVar(&c.Conf.ResultsDir, "results-dir", defaultResultsDir, "/path/to/results") @@ -151,9 +150,11 @@ func (p *ServerCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{} util.Log = util.NewCustomLogger(c.ServerInfo{}) cvelog.SetLogger(c.Conf.LogDir, false, c.Conf.Debug, false) - if err := c.Load(p.configPath, ""); err != nil { - util.Log.Errorf("Error loading %s. err: %+v", p.configPath, err) - return subcommands.ExitUsageError + if p.configPath != "" { + if err := c.Load(p.configPath, ""); err != nil { + util.Log.Errorf("Error loading %s. err: %+v", p.configPath, err) + return subcommands.ExitUsageError + } } c.Conf.CveDict.Overwrite(p.cveDict)