yo/mynettcptable
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Dont create pidfile if not defined

Browse Source
This commit is contained in:
yo 2022-05-17 11:43:36 +02:00
parent a84e22ce61
commit 28dd17ccee
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mynettcptable.go
View File

@ -26,7 +26,7 @@ import (
) )
const ( const (
version = "1.0.0-rc2" version = "1.0.0-rc3"
) )
var ( var (
@ -301,7 +301,7 @@ func connectLdap() (*ldap.Conn, error) {
} }
err = conLdap.Bind(*ldapUser, *ldapPass) err = conLdap.Bind(*ldapUser, *ldapPass)
if err != nil { if err != nil {
logstream.Errorf("Error binding LDAP: ", err) logstream.Errorf("Error binding LDAP: %s", err)
return conLdap, err return conLdap, err
} }
return conLdap, err return conLdap, err
@ -349,7 +349,7 @@ func main() {
ldapBaseDN = fs.String("ldapDN", "", "LDAP base DN (also via LDAPDN env var)") ldapBaseDN = fs.String("ldapDN", "", "LDAP base DN (also via LDAPDN env var)")
ldapUser = fs.String("ldapUser", "", "LDAP user DN (also via LDAPUSER env var)") ldapUser = fs.String("ldapUser", "", "LDAP user DN (also via LDAPUSER env var)")
ldapPass = fs.String("ldapPass", "", "LDAP user password (also via LDAPPASS env var)") ldapPass = fs.String("ldapPass", "", "LDAP user password (also via LDAPPASS env var)")
pidFilePath = fs.String("pidfile", "/var/run/mynettcptable/mynettcptable.pid", "PID File (also via PIDFILE env var)") pidFilePath = fs.String("pidfile", "", "PID File (also via PIDFILE env var). Creates pidfile only if defined")
refreshInterval = fs.Int("refresh", 300, "Net cache update interval in seconds") refreshInterval = fs.Int("refresh", 300, "Net cache update interval in seconds")
timeout = fs.Int("timeout", 5, "timeout in seconds") timeout = fs.Int("timeout", 5, "timeout in seconds")
_ = fs.String("config", "", "config file (optional)") _ = fs.String("config", "", "config file (optional)")
@ -403,11 +403,13 @@ func main() {
logstream.Hooks.Add(hook) logstream.Hooks.Add(hook)
} }
if len(pidfile) > 0 {
if pid, err := pidfile.Create(*pidFilePath); err != nil { if pid, err := pidfile.Create(*pidFilePath); err != nil {
logstream.Fatal(err) logstream.Fatal(err)
} else { } else {
defer pid.Clear() defer pid.Clear()
} }
}
logstream.Infof("Start listening for incoming connections on %s\n", *listen) logstream.Infof("Start listening for incoming connections on %s\n", *listen)
run() run()