Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[bugfix] LogOpts doesn't take effect in pouchd config file #2938

Merged
merged 1 commit into from
Jul 2, 2019
Merged

[bugfix] LogOpts doesn't take effect in pouchd config file #2938

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,6 @@ func setupFlags(cmd *cobra.Command) {

// runDaemon prepares configs, setups essential details and runs pouchd daemon.
func runDaemon(cmd *cobra.Command) error {
if err := loadDaemonFile(cfg, cmd.Flags()); err != nil {
return fmt.Errorf("failed to load daemon file: %s", err)
}

// parse log driver config
logOptMap, err := opts.ParseLogOptions(cfg.DefaultLogConfig.LogDriver, logOpts)
Expand All @@ -165,6 +162,10 @@ func runDaemon(cmd *cobra.Command) error {
cfg.DefaultLogConfig.LogOpts = logOptMap
}

if err := loadDaemonFile(cfg, cmd.Flags()); err != nil {
return fmt.Errorf("failed to load daemon file: %s", err)
}

//user specifies --version or -v, print version and return.
if printVersion {
fmt.Printf("pouchd version: %s, build: %s, build at: %s\n", version.Version, version.GitCommit, version.BuildTime)
Expand Down