🎨 Logging enhancements

Author: mudler

pkg/edgevpn/files.go

@@ -20,7 +20,7 @@ const (
 
 func (e *EdgeVPN) SendFile(ledger *blockchain.Ledger, fileID, filepath string) error {
 
-	e.Logger().Infof("Serving '%s' as '%s", filepath, fileID)
+	e.Logger().Infof("Serving '%s' as '%s'", filepath, fileID)
 
 	// By announcing periodically our service to the blockchain
 	ledger.Announce(
@@ -137,7 +137,7 @@ func (e *EdgeVPN) ReceiveFile(ledger *blockchain.Ledger, fileID string, path str
 	if err != nil {
 		return err
 	}
-	e.config.Logger.Infof("Saving file %s to %s", fileID, path)
+	e.Logger().Infof("Saving file %s to %s", fileID, path)
 
 	f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0755)
 	if err != nil {
@@ -148,6 +148,6 @@ func (e *EdgeVPN) ReceiveFile(ledger *blockchain.Ledger, fileID string, path str
 
 	f.Close()
 
-	e.config.Logger.Infof("Received file %s to %s", fileID, path)
+	e.Logger().Infof("Received file %s to %s", fileID, path)
 	return nil
 }

pkg/edgevpn/services.go

@@ -73,7 +73,7 @@ func (e *EdgeVPN) ExposeService(ledger *blockchain.Ledger, serviceID, dstaddress
 			stream.Close()
 			c.Close()
 
-			e.config.Logger.Info("(service %s) Handled correctly '%s'", serviceID, stream.Conn().RemotePeer().String())
+			e.config.Logger.Infof("(service %s) Handled correctly '%s'", serviceID, stream.Conn().RemotePeer().String())
 		}()
 	}
 }

pkg/logger/logger.go

@@ -69,7 +69,7 @@ func (l Logger) Fatal(args ...interface{}) {
 
 func (l Logger) Fatalf(f string, args ...interface{}) {
 	if l.enabled(log.LevelFatal) {
-		pterm.Fatal.Printfln(pterm.Red(joinMsg(args...)))
+		pterm.Fatal.Printfln(pterm.Red(f), args...)
 	}
 }
 
@@ -81,7 +81,7 @@ func (l Logger) Info(args ...interface{}) {
 
 func (l Logger) Infof(f string, args ...interface{}) {
 	if l.enabled(log.LevelInfo) {
-		pterm.Info.Printfln(pterm.LightBlue(joinMsg(args...)))
+		pterm.Info.Printfln(pterm.LightBlue(f), args...)
 	}
 }
 
@@ -101,7 +101,7 @@ func (l Logger) Warn(args ...interface{}) {
 
 func (l Logger) Warnf(f string, args ...interface{}) {
 	if l.enabled(log.LevelWarn) {
-		pterm.Warning.Printfln(pterm.LightYellow(joinMsg(args...)))
+		pterm.Warning.Printfln(pterm.LightYellow(f), args...)
 	}
 }