Merge branch 'main' of https://github.com/bisohns/saido

bisohns · Nov 5, 2022 · 57f5ab2 · 57f5ab2
2 parents 3d5724e + cbb49ae
commit 57f5ab2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/client/controller.go b/client/controller.go
@@ -89,7 +89,9 @@ func (hosts *HostsController) sendMetric(host config.Host, client *Client) {
  },
  Error: false,
  }
- client.Send <- message
+ if config.Contains(hosts.ReadOnlyHosts, host) {
+ client.Send <- message
+ }
  } else {
  // check for error 127 which means command was not found
  var errorContent string
@@ -112,7 +114,10 @@ func (hosts *HostsController) sendMetric(host config.Host, client *Client) {
 func (hosts *HostsController) Poll(client *Client) {
  for {
  for _, host := range hosts.Info.Hosts {
- if config.Contains(hosts.ReadOnlyHosts, host) && hosts.clientConnected() {
+ if !hosts.clientConnected() {
+ return
+ }
+ if config.Contains(hosts.ReadOnlyHosts, host) {
  go hosts.sendMetric(host, client)
  }
  }

diff --git a/inspector/tcp.go b/inspector/tcp.go
@@ -129,7 +129,7 @@ func (i *TcpLinux) Parse(output string) {
  portString := address[len(address)-1]
  port, err := strconv.Atoi(portString)
  if err != nil {
- log.Fatal("Could not parse port number in TcpLinux")
+ log.Fatalf("Could not parse port number in TcpLinux %s", err.Error())
  }
  ports[port] = status
  }