Use log.Logger instead of io.Writers for logging

Use log.Logger instead of io.Writers for logging
to improve log customization.

client/client.go

@@ -118,16 +118,8 @@ func NewClient(
 
 		reqman.NewRequestManager(),
 
-		log.New(
-			opts.WarnLog,
-			"WARNING: ",
-			log.Ldate|log.Ltime|log.Lshortfile,
-		),
-		log.New(
-			opts.ErrorLog,
-			"ERROR: ",
-			log.Ldate|log.Ltime|log.Lshortfile,
-		),
+		opts.WarnLog,
+		opts.ErrorLog,
 	}
 
 	if autoconnect == AutoconnectEnabled {

client/options.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"io"
+	"log"
 	"os"
 	"time"
 
@@ -48,10 +48,10 @@ type Options struct {
 	ReconnectionInterval time.Duration
 
 	// WarnLog defines the warn logging output target
-	WarnLog io.Writer
+	WarnLog *log.Logger
 
 	// ErrorLog defines the error logging output target
-	ErrorLog io.Writer
+	ErrorLog *log.Logger
 }
 
 // SetDefaults sets default values for undefined required options
@@ -72,11 +72,19 @@ func (opts *Options) SetDefaults() {
 		opts.ReconnectionInterval = 2 * time.Second
 	}
 
+	// Create default loggers to std-out/err when no loggers are specified
 	if opts.WarnLog == nil {
-		opts.WarnLog = os.Stdout
+		opts.WarnLog = log.New(
+			os.Stdout,
+			"WEBWIRE_CLT_WARN: ",
+			log.Ldate|log.Ltime|log.Lshortfile,
+		)
 	}
-
 	if opts.ErrorLog == nil {
-		opts.ErrorLog = os.Stderr
+		opts.ErrorLog = log.New(
+			os.Stderr,
+			"WEBWIRE_CLT_ERR: ",
+			log.Ldate|log.Ltime|log.Lshortfile,
+		)
 	}
 }

examples/chatroom/client/main.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"flag"
+	"log"
+	"os"
 	"time"
 
 	"github.com/qbeon/webwire-go/examples/chatroom/shared"
@@ -30,6 +32,18 @@ func NewChatroomClient(serverAddr string) *ChatroomClient {
 			// Session info parser function must override the default one
 			// for the session info object to be typed as shared.SessionInfo
 			SessionInfoParser: shared.SessionInfoParser,
+
+			// Custom loggers
+			WarnLog: log.New(
+				os.Stdout,
+				"WARN: ",
+				log.Ldate|log.Ltime|log.Lshortfile,
+			),
+			ErrorLog: log.New(
+				os.Stderr,
+				"ERR: ",
+				log.Ldate|log.Ltime|log.Lshortfile,
+			),
 		},
 	)
 

examples/chatroom/server/main.go

@@ -24,8 +24,16 @@ func main() {
 			ServerAddress: *serverAddr,
 			ServerOptions: wwr.ServerOptions{
 				SessionsEnabled: true,
-				WarnLog:         os.Stdout,
-				ErrorLog:        os.Stderr,
+				WarnLog: log.New(
+					os.Stdout,
+					"WARN: ",
+					log.Ldate|log.Ltime|log.Lshortfile,
+				),
+				ErrorLog: log.New(
+					os.Stderr,
+					"ERR: ",
+					log.Ldate|log.Ltime|log.Lshortfile,
+				),
 			},
 		},
 	)

examples/echo/server/server.go

@@ -70,10 +70,7 @@ func main() {
 		&EchoServer{},
 		wwr.HeadedServerOptions{
 			ServerAddress: *serverAddr,
-			ServerOptions: wwr.ServerOptions{
-				WarnLog:  os.Stdout,
-				ErrorLog: os.Stderr,
-			},
+			ServerOptions: wwr.ServerOptions{},
 		},
 	)
 	if err != nil {

examples/pubsub/server/server.go

@@ -124,10 +124,7 @@ func main() {
 		serverImpl,
 		wwr.HeadedServerOptions{
 			ServerAddress: *serverAddr,
-			ServerOptions: wwr.ServerOptions{
-				WarnLog:  os.Stdout,
-				ErrorLog: os.Stderr,
-			},
+			ServerOptions: wwr.ServerOptions{},
 		},
 	)
 	if err != nil {

options.go

@@ -1,7 +1,7 @@
 package webwire
 
 import (
-	"io"
+	"log"
 	"os"
 )
 
@@ -12,8 +12,8 @@ type ServerOptions struct {
 	SessionKeyGenerator   SessionKeyGenerator
 	SessionInfoParser     SessionInfoParser
 	MaxSessionConnections uint
-	WarnLog               io.Writer
-	ErrorLog              io.Writer
+	WarnLog               *log.Logger
+	ErrorLog              *log.Logger
 }
 
 // SetDefaults sets the defaults for undefined required values
@@ -31,12 +31,20 @@ func (srvOpt *ServerOptions) SetDefaults() {
 		srvOpt.SessionInfoParser = GenericSessionInfoParser
 	}
 
+	// Create default loggers to std-out/err when no loggers are specified
 	if srvOpt.WarnLog == nil {
-		srvOpt.WarnLog = os.Stdout
+		srvOpt.WarnLog = log.New(
+			os.Stdout,
+			"WEBWIRE_WARN: ",
+			log.Ldate|log.Ltime|log.Lshortfile,
+		)
 	}
-
 	if srvOpt.ErrorLog == nil {
-		srvOpt.ErrorLog = os.Stderr
+		srvOpt.ErrorLog = log.New(
+			os.Stderr,
+			"WEBWIRE_ERR: ",
+			log.Ldate|log.Ltime|log.Lshortfile,
+		)
 	}
 }
 

server.go

@@ -61,16 +61,8 @@ func NewServer(implementation ServerImplementation, opts ServerOptions) *Server
 
 		// Internals
 		connUpgrader: newConnUpgrader(),
-		warnLog: log.New(
-			opts.WarnLog,
-			"WARNING: ",
-			log.Ldate|log.Ltime|log.Lshortfile,
-		),
-		errorLog: log.New(
-			opts.ErrorLog,
-			"ERROR: ",
-			log.Ldate|log.Ltime|log.Lshortfile,
-		),
+		warnLog:      opts.WarnLog,
+		errorLog:     opts.ErrorLog,
 	}
 
 	return &srv