Skip to content
Snippets Groups Projects
Verified Commit 86f9c39e authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixed error handling

parent a9ca8d77
Branches main
No related tags found
No related merge requests found
package main package main
import ( import (
"errors"
"fmt"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"time" "time"
) )
...@@ -20,6 +22,13 @@ func (m *QuasselMonitor) Config() *ConfigComponent { ...@@ -20,6 +22,13 @@ func (m *QuasselMonitor) Config() *ConfigComponent {
} }
func (m *QuasselMonitor) Measure() (Datapoint, error) { func (m *QuasselMonitor) Measure() (Datapoint, error) {
var err error
defer func() {
if r := recover(); r != nil {
err = errors.New(fmt.Sprintf("Caught error: %v", r))
}
}()
before := time.Now() before := time.Now()
conn := Connect(ConnectOptions{ conn := Connect(ConnectOptions{
ConnectionOptions: ConnectionOptions{ ConnectionOptions: ConnectionOptions{
...@@ -30,11 +39,15 @@ func (m *QuasselMonitor) Measure() (Datapoint, error) { ...@@ -30,11 +39,15 @@ func (m *QuasselMonitor) Measure() (Datapoint, error) {
Verify: !m.config.Quassel.Insecure, Verify: !m.config.Quassel.Insecure,
}) })
defer conn.Close() defer conn.Close()
after := time.Now() after := time.Now()
latency := int(after.Sub(before).Nanoseconds() / 1000000) latency := int(after.Sub(before).Nanoseconds() / 1000000)
if err == nil {
err = conn.Error()
}
if conn.Error() != nil { if err != nil {
logrus.Infof("Monitor %s: %s", conn.Error()) logrus.Infof("Monitor %s: %s", err)
return Datapoint{ return Datapoint{
Time: after, Time: after,
Up: false, Up: false,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment