@@ -16,7 +16,7 @@ import (
1616 "github.com/BurntSushi/xgbutil/keybind"
1717 "github.com/BurntSushi/xgbutil/mousebind"
1818 "github.com/BurntSushi/xgbutil/xevent"
19- "go.uber.org/zap "
19+ "github.com/sirupsen/logrus "
2020)
2121
2222var usage = `NAME
@@ -83,23 +83,26 @@ func main() {
8383
8484 if opts .config != nil {
8585 if validPath , err = isPathToConfigValid (* opts .config ); ! (err == nil && validPath ) {
86- zap .L ().Fatal ("path to the config is not valid" , zap .String ("path" , * opts .config ), zap .Bool ("valid" , validPath ), zap .Error (err ))
86+ logger .WithFields (logrus.Fields {
87+ "path" : * opts .config ,
88+ "valid" : validPath ,
89+ }).WithError (err ).Fatal ("path to the config is not valid" )
8790 }
8891 configFilePath = * opts .config
8992 } else {
9093 configFilePath , _ , err = getDefaultConfigPath ()
9194 if err != nil {
92- zap . L ( ).Fatal ("can not get default config path" , zap . Error ( err ) )
95+ logger . WithError ( err ).Fatal ("can not get config path" )
9396 }
9497
9598 if validPath , err = isPathToConfigValid (configFilePath ); ! (err == nil && validPath ) {
9699 if os .IsNotExist (err ) {
97100 err = createDefaultConfig ()
98101 if err != nil {
99- zap . L ( ).Fatal ("can not create default config" , zap . String ( "path" , configFilePath ), zap . Error ( err ) )
102+ logger . WithField ( "path" , configFilePath ).Fatal ("can not create default config" )
100103 }
101104 } else {
102- zap . L (). Fatal ("path to the config is not valid" , zap . String ( "path" , configFilePath ), zap . Bool ( "valid" , validPath ), zap . Error ( err ) )
105+ logger . WithFields (logrus. Fields { "path" : configFilePath , "valid" : validPath }). WithError ( err ). Fatal ("path to the config is not valid" )
103106 }
104107 }
105108 }
@@ -116,7 +119,7 @@ func main() {
116119
117120 shell , err = parse (configFilePath , & data )
118121 if err != nil {
119- zap . L (). Fatal ("failed to parse config" , zap . String ( "file" , configFilePath ), zap . Error ( err ) )
122+ logger . WithField ( "file" , configFilePath ). WithError ( err ). Fatal ("failed to parse config" )
120123 }
121124
122125 if opts .parseTime {
@@ -145,7 +148,7 @@ func main() {
145148 if opts .kill || opts .reload {
146149 execName , err := os .Executable ()
147150 if err != nil {
148- zap . L ( ).Fatal ("can not get executable" , zap . Error ( err ) )
151+ logger . WithError ( err ).Fatal ("can not get executable" )
149152 }
150153
151154 if opts .kill {
@@ -177,8 +180,7 @@ func main() {
177180 os .Exit (0 )
178181 }
179182
180- zap .L ().Debug ("starting dxhd" , zap .String ("version" , version ))
181- zap .L ().Debug ("custom path might be provided" , zap .String ("path" , configFilePath ))
183+ logger .WithFields (logrus.Fields {"version" : version , "path" : configFilePath }).Debug ("starting dxhd" )
182184
183185 // catch these signals
184186 signals := make (chan os.Signal , 1 )
@@ -193,13 +195,13 @@ toplevel:
193195 if len (data ) == 0 {
194196 shell , err = parse (configFilePath , & data )
195197 if err != nil {
196- zap . L (). Fatal ("failed to parse config" , zap . String ( "file" , configFilePath ), zap . Error ( err ) )
198+ logger . WithField ( "file" , configFilePath ). WithError ( err ). Fatal ("failed to parse config" )
197199 }
198200 }
199201
200202 X , err := xgbutil .NewConn ()
201203 if err != nil {
202- zap . L ( ).Fatal ("can not open connection to Xorg" , zap . Error ( err ) )
204+ logger . WithError ( err ).Fatal ("can not open connection to Xorg" )
203205 }
204206
205207 keybind .Initialize (X )
@@ -208,7 +210,7 @@ toplevel:
208210 for _ , d := range data {
209211 err = listenKeybinding (X , errs , d .evtType , shell , d .binding .String (), d .action .String ())
210212 if err != nil {
211- zap . L (). Info ( "can not register a keybinding"zap . String ( "keybinding" , d .binding .String ()), zap . Error (err ))
213+ logger . WithField ( " keybinding"d .binding .String ()). WithError (err ). Warn ( "can not register a keybinding" )
212214 }
213215 }
214216
@@ -220,18 +222,18 @@ toplevel:
220222 select {
221223 case err = <- errs :
222224 if err != nil {
223- zap . L (). Info ("a command resulted into an error" , zap . Error ( err ) )
225+ logger . WithError ( err ). Warn ("a command resulted into an error" )
224226 }
225227 continue
226228 case sig := <- signals :
227229 keybind .Detach (X , X .RootWin ())
228230 mousebind .Detach (X , X .RootWin ())
229231 xevent .Quit (X )
230232 if sig == syscall .SIGUSR1 || sig == syscall .SIGUSR2 {
231- zap . L () .Debug ("user defined signal received, reloading" )
233+ logger .Debug ("user defined signal received, reloading" )
232234 continue toplevel
233235 }
234- zap . L () .Info ("signal received, shutting down" , zap . String ( "signal" , sig . String ()) )
236+ logger . WithField ( "signal" , sig . String ()) .Info ("signal received, shutting down" )
235237 if env , err := strconv .ParseBool (os .Getenv ("STACKTRACE" )); env && err == nil {
236238 buf := make ([]byte , 1 << 20 )
237239 stackLen := runtime .Stack (buf , true )
0 commit comments