Skip to content

bugfix: add judge for whether pidfile path is given #1374

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

Merged
merged 1 commit into from
May 23, 2018
Merged

bugfix: add judge for whether pidfile path is given #1374

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
18 changes: 10 additions & 8 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,17 @@ func runDaemon() error {
}

// saves daemon pid to pidfile.
if err := utils.NewPidfile(cfg.Pidfile); err != nil {
logrus.Errorf("failed to create pidfile: %s", err)
return err
}
defer func() {
if err := os.Remove(cfg.Pidfile); err != nil {
logrus.Errorf("failed to delete pidfile: %s", err)
if cfg.Pidfile != "" {
Copy link
Contributor

@HusterWan HusterWan May 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If Pidfile exists, do we need to truncate it's content ?

Copy link
Contributor Author

@Ace-Tang Ace-Tang May 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look at utils.NewPidfile, it won't go ahead when pidfile has value, it a common logic most process deal with.

if err := utils.NewPidfile(cfg.Pidfile); err != nil {
logrus.Errorf("failed to create pidfile: %s", err)
return err
}
}()
defer func() {
if err := os.Remove(cfg.Pidfile); err != nil {
logrus.Errorf("failed to delete pidfile: %s", err)
}
}()
}

// set pouchd oom-score
if err := utils.SetOOMScore(os.Getpid(), cfg.OOMScoreAdjust); err != nil {
Expand Down