From 72fd02704fa1eba1e229544895ef44be7b579915 Mon Sep 17 00:00:00 2001 From: Laurent Ulrich Date: Sun, 20 Aug 2023 20:57:07 +0200 Subject: [PATCH] correction erreur de build --- hostchecker.go | 82 +++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/hostchecker.go b/hostchecker.go index e1b06b4..3ccbf5a 100644 --- a/hostchecker.go +++ b/hostchecker.go @@ -49,22 +49,23 @@ type Group struct { } var verbose int + func main() { - if verbose > 0 { - log.Println("Starting") - } + if verbose > 0 { + log.Println("Starting") + } confFileName := flag.String("f", "/usr/local/etc/hostchecker.yaml", "YAML configuration file") flag.IntVar(&verbose, "verbose", 0, "Set logs verbosity") useSyslog := flag.Bool("syslog", false, "Send logs to syslog") flag.Parse() - if *useSyslog == true { - syslogWriter, err := syslog.New(syslog.LOG_ERR, "hostchecker") - if err != nil { - log.Fatal("Error opening syslog #", err) - } - log.SetOutput(syslogWriter) - } + if *useSyslog == true { + syslogWriter, err := syslog.New(syslog.LOG_ERR, "hostchecker") + if err != nil { + log.Fatal("Error opening syslog #", err) + } + log.SetOutput(syslogWriter) + } var waitGroup sync.WaitGroup var conf map[string]Group @@ -83,9 +84,9 @@ func main() { } stopChannel := make(chan bool) for name, group := range conf { - if verbose > 0 { - log.Println("Checking group", name, group) - } + if verbose > 0 { + log.Println("Checking group", name, group) + } waitGroup.Add(1) go checkGroup(name, group, &waitGroup, stopChannel) } @@ -95,12 +96,12 @@ func main() { signal.Notify(exit, os.Interrupt) s := <-exit - if verbose > 1 { - log.Println("Received signal", s) - } - if verbose > 0 { - log.Println("main closing stopChannel") - } + if verbose > 1 { + log.Println("Received signal", s) + } + if verbose > 0 { + log.Println("main closing stopChannel") + } close(stopChannel) waitGroup.Wait() } @@ -117,24 +118,23 @@ func checkGroup(name string, group Group, waitGroup *sync.WaitGroup, stopChannel for { select { case <-stopChannel: - if verbose > 0 { - log.Println("checkGroup", name, "stopChannel") - } + if verbose > 0 { + log.Println("checkGroup", name, "stopChannel") + } waitGroup.Done() return - break default: for host, channel := range channels { select { case stop := <-stopChannel: - if verbose > 0 { - log.Println("checkGroup", name, "stopChannel", stop) - } + if verbose > 0 { + log.Println("checkGroup", name, "stopChannel", stop) + } break case status := <-channel: - if verbose > 1 { - log.Println("Status for ", host, "is", status, "in group", name) - } + if verbose > 1 { + log.Println("Status for ", host, "is", status, "in group", name) + } updateTables(host, status, group.Tables) default: time.Sleep(100 * time.Millisecond) @@ -165,9 +165,9 @@ func checkHost(status chan<- int, group string, host string, check Check, waitGr for { select { case <-stopChannel: - if verbose > 0 { - log.Println("checkHost", host, "group", group, "stopChannel") - } + if verbose > 0 { + log.Println("checkHost", host, "group", group, "stopChannel") + } waitGroup.Done() return default: @@ -185,9 +185,9 @@ func checkHost(status chan<- int, group string, host string, check Check, waitGr } if err != nil { status <- 1 - if verbose > 1 { - log.Println("checkHost", host, "group", group, "error", err) - } + if verbose > 1 { + log.Println("checkHost", host, "group", group, "error", err) + } } else { status <- 0 } @@ -234,15 +234,15 @@ func CheckSMTP(host string, check Check) error { func validateConfiguration(conf map[string]Group) error { for name, group := range conf { - if verbose > 1 { - log.Println("Validating configuration", name) - } + if verbose > 1 { + log.Println("Validating configuration", name) + } if len(group.Tables) == 0 { return errors.New(fmt.Sprintf("No tables in group %s", name)) } - if verbose > 1 { - log.Println("Hosts", group.Hosts) - } + if verbose > 1 { + log.Println("Hosts", group.Hosts) + } if len(group.Hosts) == 0 { return errors.New(fmt.Sprintf("No hosts in group %s", name)) }