@@ -18,7 +18,8 @@ import (
18
18
"syscall"
19
19
"time"
20
20
21
- log "github.com/sirupsen/logrus"
21
+ "github.com/apex/log"
22
+ "github.com/sirupsen/logrus"
22
23
"golang.org/x/crypto/pbkdf2"
23
24
"nhooyr.io/websocket"
24
25
)
@@ -65,7 +66,7 @@ type Wattpilot struct {
65
66
interrupt chan os.Signal
66
67
67
68
notify * Pubsub
68
- logger * log .Logger
69
+ logger * logrus .Logger
69
70
conn * websocket.Conn
70
71
}
71
72
@@ -86,12 +87,12 @@ func New(host string, password string) *Wattpilot {
86
87
isInitialized : false ,
87
88
requestId : 0 ,
88
89
data : make (map [string ]interface {}),
89
- logger : log .New (),
90
+ logger : logrus .New (),
90
91
notify : NewPubsub (),
91
92
}
92
93
93
- w .logger .SetFormatter (& log .JSONFormatter {})
94
- w .logger .SetLevel (log .ErrorLevel )
94
+ w .logger .SetFormatter (& logrus .JSONFormatter {})
95
+ w .logger .SetLevel (logrus .ErrorLevel )
95
96
if level := os .Getenv ("WATTPILOT_LOG" ); level != "" {
96
97
if err := w .ParseLogLevel (level ); err != nil {
97
98
w .logger .Warn ("Could not parse log level setting " , err )
@@ -116,15 +117,15 @@ func New(host string, password string) *Wattpilot {
116
117
117
118
}
118
119
func (w * Wattpilot ) SetLogger (logger * log.Logger ) {
119
- w .logger = logger
120
+ w .logger . SetOutput ( logger )
120
121
}
121
122
122
- func (w * Wattpilot ) SetLogLevel (level log .Level ) {
123
+ func (w * Wattpilot ) SetLogLevel (level logrus .Level ) {
123
124
w .logger .SetLevel (level )
124
125
}
125
126
126
127
func (w * Wattpilot ) ParseLogLevel (level string ) error {
127
- loglevel , err := log .ParseLevel (level )
128
+ loglevel , err := logrus .ParseLevel (level )
128
129
if err != nil {
129
130
return err
130
131
}
0 commit comments