Skip to content

Commit 435de6d

Browse files
author
Leon Sodhi
committed
Merge pull request #21 from papertrail/lockfile-fix
Use the leonsodhi fork for lockfile for the fix
2 parents eb1836d + 14d7f4a commit 435de6d

File tree

10 files changed

+274
-10
lines changed

10 files changed

+274
-10
lines changed

Godeps/Godeps.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/leonsodhi/lockfile/.gitignore

+27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/leonsodhi/lockfile/.gitmodules

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/leonsodhi/lockfile/.travis.yml

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/leonsodhi/lockfile/LICENSE

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/leonsodhi/lockfile/README.md

+52
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/leonsodhi/lockfile/lockfile.go

+142
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/leonsodhi/lockfile/lockfile_test.go

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config_manager.go

-7
Original file line numberDiff line numberDiff line change
@@ -309,14 +309,7 @@ func (cm *ConfigManager) defaultPidFile() string {
309309
if err != nil {
310310
continue
311311
}
312-
tmpPidFile := fd.Name()
313312
fd.Close()
314-
err = os.Remove(tmpPidFile)
315-
if err != nil {
316-
// Die because the lockfile lib can't handle an existing blank file
317-
log.Criticalf("Can't remove temp pid file. Details: %s", err.Error())
318-
os.Exit(1)
319-
}
320313
return f
321314
}
322315
return "/tmp/remote_syslog.pid"

utils/daemonize.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"path/filepath"
1010

1111
"github.com/VividCortex/godaemon"
12-
"github.com/nightlyone/lockfile"
12+
"github.com/leonsodhi/lockfile"
1313
)
1414

1515
const CanDaemonize = true

0 commit comments

Comments
 (0)