kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

stale pidfile handling

Browse Source
This commit is contained in:
Niko Kivel
2021-11-17 23:46:21 +01:00
committed by Christian Goll
parent 05f9c4d3af
commit 5abb1fc4c7
2 changed files with 101 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
internal/app/wwclient/root.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/google/uuid"
"github.com/talos-systems/go-smbios/smbios"
"github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/pidfile"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
"github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/spf13/cobra"
@@ -53,16 +53,12 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
return err
}
if util.IsFile(PIDFile) {
pid, err := pidfile.Write(PIDFile)
if err != nil && pid == -1 {
wwlog.Printf(wwlog.WARN, "%v. starting new wwclient", err)
} else if err != nil && pid > 0 {
return errors.New("found pidfile " + PIDFile + " not starting")
}
p, err := os.OpenFile(PIDFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
if err != nil {
return err
}
defer p.Close()
fmt.Fprintf(p, "%d", os.Getpid())
if os.Args[0] == "/warewulf/bin/wwclient" {
err := os.Chdir("/")
@@ -137,20 +133,20 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
wwid := strings.Split(wwid_tmp[1], " ")[0]
// listen on SIGHUP
sigs := make(chan os.Signal)
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, syscall.SIGHUP, syscall.SIGTERM, syscall.SIGINT)
go func() {
for sig := range sigs {
switch sig {
case syscall.SIGHUP:
log.Printf("Received SIGNAL: %s\n", sig)
updateSystem(conf.Ipaddr, conf.Warewulf.Port, wwid, tag, localUUID)
case syscall.SIGTERM, syscall.SIGINT:
cleanUp()
os.Exit(0)
}
sig := <-sigs
switch sig {
case syscall.SIGHUP:
log.Printf("Received SIGNAL: %s\n", sig)
updateSystem(conf.Ipaddr, conf.Warewulf.Port, wwid, tag, localUUID)
case syscall.SIGTERM, syscall.SIGINT:
wwlog.Printf(wwlog.INFO, "termination wwclient!, %v", sig)
cleanUp()
os.Exit(0)
}
}()
@@ -200,9 +196,8 @@ func updateSystem(ipaddr string, port int, wwid string, tag string, localUUID uu
}
func cleanUp() {
err := os.Remove(PIDFile)
err := pidfile.Remove(PIDFile)
if err != nil {
log.Printf("could not remove pidfile: %s\n", err)
wwlog.Printf(wwlog.ERROR, "could not remove pidfile: %s\n", err)
}
}