Use a regular logger, add mod support

Author: christopher-dG

client.go

@@ -33,15 +33,15 @@ type Client struct {
 // poll listens for responses/events.
 // This function blocks until Disconnect is called.
 func (c *Client) poll() {
-	logger.Debug("started polling")
+	Logger.Println("started polling")
 
 	for c.connected {
 		m := make(map[string]interface{})
 		if err := c.conn.ReadJSON(&m); err != nil {
 			if !c.connected {
 				return
 			}
-			logger.Warning("read from WS:", err)
+			Logger.Println("read from WS:", err)
 			continue
 		}
 
@@ -80,12 +80,12 @@ func mapToStruct(data map[string]interface{}, dest interface{}) error {
 		Result:  dest,
 	})
 	if err != nil {
-		logger.Warning("initializing decoder:", err)
+		Logger.Println("initializing decoder:", err)
 		return err
 	}
 	if err = decoder.Decode(data); err != nil {
-		logger.Warningf("unmarshalling map -> %T: %v", dest, err)
-		logger.Debugf("input: %#v\n", data)
+		Logger.Printf("unmarshalling map -> %T: %v", dest, err)
+		Logger.Printf("input: %#v\n", data)
 		return err
 	}
 	return nil

client_connection.go

@@ -33,14 +33,14 @@ func (c *Client) Connect() error {
 	}
 
 	if !respGAR.AuthRequired {
-		logger.Info("logged in (no authentication required)")
+		Logger.Println("logged in (no authentication required)")
 		c.connected = true
 		go c.poll()
 		return nil
 	}
 
 	auth := getAuth(c.Password, respGAR.Salt, respGAR.Challenge)
-	logger.Debug("auth:", auth)
+	Logger.Println("auth:", auth)
 
 	reqA := NewAuthenticateRequest(auth)
 	if err = c.conn.WriteJSON(reqA); err != nil {
@@ -55,7 +55,7 @@ func (c *Client) Connect() error {
 		return errors.New(respA.Error())
 	}
 
-	logger.Info("logged in (authentication successful)")
+	Logger.Println("logged in (authentication successful)")
 	c.connected = true
 	go c.poll()
 	return nil
@@ -73,7 +73,7 @@ func (c *Client) Disconnect() error {
 // connectWS opens the WebSocket connection.
 func connectWS(host string, port int) (*websocket.Conn, error) {
 	url := fmt.Sprintf("ws://%s:%d", host, port)
-	logger.Debug("connecting to", url)
+	Logger.Println("connecting to", url)
 	conn, _, err := websocket.DefaultDialer.Dial(url, nil)
 	if err != nil {
 		return nil, err

client_events.go

@@ -27,7 +27,7 @@ func (c *Client) handleEvent(m map[string]interface{}) {
 
 	eventFn, ok := eventMap[t]
 	if !ok {
-		logger.Warning("unknown event type:", m["update-type"])
+		Logger.Println("unknown event type:", m["update-type"])
 		return
 	}
 	event := eventFn()
@@ -38,7 +38,7 @@ func (c *Client) handleEvent(m map[string]interface{}) {
 	}
 
 	if err := mapToStruct(m, event); err != nil {
-		logger.Warning("event handler failed:", err)
+		Logger.Println("event handler failed:", err)
 		return
 	}
 

client_requests.go

@@ -23,7 +23,7 @@ func (c *Client) sendRequest(req Request) (chan map[string]interface{}, error) {
 	if err := c.conn.WriteJSON(req); err != nil {
 		return nil, err
 	}
-	logger.Debug("sent request", req.ID())
+	Logger.Println("sent request", req.ID())
 	go func() { future <- c.receive(req.ID()) }()
 	return future, nil
 }
@@ -33,7 +33,7 @@ func (c *Client) receive(id string) map[string]interface{} {
 	for {
 		resp := <-c.respQ
 		if resp["message-id"] == id {
-			logger.Debug("received response", resp["message-id"])
+			Logger.Println("received response", resp["message-id"])
 			return resp
 		}
 		c.respQ <- resp

go.mod

@@ -0,0 +1,6 @@
+module github.com/christopher-dG/go-obs-websocket
+
+require (
+	github.com/gorilla/websocket v1.4.0
+	github.com/mitchellh/mapstructure v1.1.2
+)

go.sum

@@ -0,0 +1,4 @@
+github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=

logger.go

@@ -1,5 +1,8 @@
 package obsws
 
-import "github.com/op/go-logging"
+import (
+	"log"
+	"os"
+)
 
-var logger = logging.MustGetLogger("obsws")
+var Logger = log.New(os.Stdout, "[obsws] ", log.LstdFlags)