fix: panic when probe fails

jitsi-contrib · Aug 12, 2022 · 20e04da · 20e04da
1 parent a2e9df7
commit 20e04da
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/pkg/jicofo/jicofo.go b/pkg/jicofo/jicofo.go
@@ -9,14 +9,13 @@ import (
 
 	"github.com/jitsi-contrib/jitsi-exporter/pkg/generic"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 )
 
 type prober struct {
 	client *http.Client
 	target string
-	log    *logrus.Logger
 }
 
 func NewProber(client *http.Client, target string) generic.Prober {
@@ -37,14 +36,14 @@ func (p *prober) Labels() []string {
 func (c *prober) Probe() (string, bool) {
 	resp, err := c.client.Get(c.target)
 	if err != nil {
-		c.log.Error(err)
+		log.Error(err)
 		return "", false
 	}
 	defer resp.Body.Close()
 
 	data, err := io.ReadAll(resp.Body)
 	if err != nil {
-		c.log.Error(err)
+		log.Error(err)
 		return "", false
 	}
 

diff --git a/pkg/jvb/jvb.go b/pkg/jvb/jvb.go
@@ -6,13 +6,12 @@ import (
 
 	"github.com/jitsi-contrib/jitsi-exporter/pkg/generic"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 type prober struct {
 	client *http.Client
 	target string
-	log    *logrus.Logger
 }
 
 func NewProber(client *http.Client, target string) generic.Prober {
@@ -37,14 +36,14 @@ func (p *prober) Labels() []string {
 func (c *prober) Probe() (string, bool) {
 	resp, err := c.client.Get(c.target)
 	if err != nil {
-		c.log.Error(err)
+		log.Error(err)
 		return "", false
 	}
 	defer resp.Body.Close()
 
 	data, err := io.ReadAll(resp.Body)
 	if err != nil {
-		c.log.Error(err)
+		log.Error(err)
 		return "", false
 	}