Add and use configurable logger (#16)

Author: mikegray

client/build.go

@@ -11,7 +11,6 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/golang/glog"
 	jsonresp "github.com/sylabs/json-resp"
 )
 
@@ -34,7 +33,7 @@ func (c *Client) Submit(ctx context.Context, d Definition, libraryRef string, li
 	}
 	req = req.WithContext(ctx)
 	req.Header.Set("Content-Type", "application/json")
-	glog.V(2).Infof("Sending build request to %s", req.URL.String())
+	c.Logger.Logf("Sending build request to %s", req.URL.String())
 
 	res, err := c.HTTPClient.Do(req)
 	if err != nil {
@@ -44,7 +43,7 @@ func (c *Client) Submit(ctx context.Context, d Definition, libraryRef string, li
 
 	err = jsonresp.ReadResponse(res.Body, &bi)
 	if err == nil {
-		glog.V(2).Infof("Build response - id: %s, libref: %s", bi.ID, bi.LibraryRef)
+		c.Logger.Logf("Build response - id: %s, libref: %s", bi.ID, bi.LibraryRef)
 	}
 	return
 }

client/client.go

@@ -10,6 +10,8 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+
+	"github.com/go-log/log"
 )
 
 // Config contains the client configuration.
@@ -22,6 +24,8 @@ type Config struct {
 	UserAgent string
 	// HTTPClient to use to make HTTP requests (if supplied).
 	HTTPClient *http.Client
+	// Logger to be used when output is generated
+	Logger log.Logger
 }
 
 // DefaultConfig is a configuration that uses default values.
@@ -37,6 +41,8 @@ type Client struct {
 	UserAgent string
 	// HTTPClient to use to make HTTP requests.
 	HTTPClient *http.Client
+	// Logger to be used when output is generated
+	Logger log.Logger
 }
 
 const defaultBaseURL = "https://build.sylabs.io"
@@ -73,6 +79,11 @@ func New(cfg *Config) (c *Client, err error) {
 		c.HTTPClient = http.DefaultClient
 	}
 
+	if cfg.Logger != nil {
+		c.Logger = cfg.Logger
+	} else {
+		c.Logger = log.DefaultLogger
+	}
 	return c, nil
 }
 

client/output.go

@@ -11,7 +11,6 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/golang/glog"
 	"github.com/gorilla/websocket"
 )
 
@@ -36,7 +35,7 @@ func (c *Client) GetOutput(ctx context.Context, buildID string, or OutputReader)
 
 	ws, resp, err := websocket.DefaultDialer.Dial(u.String(), h)
 	if err != nil {
-		glog.V(2).Infof("websocket dial err - %s, partial response: %+v", err, resp)
+		c.Logger.Logf("websocket dial err - %s, partial response: %+v", err, resp)
 		return err
 	}
 	defer ws.Close()
@@ -55,7 +54,7 @@ func (c *Client) GetOutput(ctx context.Context, buildID string, or OutputReader)
 			if websocket.IsCloseError(err, websocket.CloseNormalClosure) {
 				return nil
 			}
-			glog.Infof("websocket read message err - %s", err)
+			c.Logger.Logf("websocket read message err - %s", err)
 			return err
 		}
 

go.mod

@@ -3,7 +3,7 @@ module github.com/sylabs/scs-build-client
 go 1.12
 
 require (
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
+	github.com/go-log/log v0.1.0
 	github.com/gorilla/websocket v1.4.0
 	github.com/sylabs/json-resp v0.5.0
 )

go.sum

@@ -1,5 +1,5 @@
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/go-log/log v0.1.0 h1:wudGTNsiGzrD5ZjgIkVZ517ugi2XRe9Q/xRCzwEO4/U=
+github.com/go-log/log v0.1.0/go.mod h1:4mBwpdRMFLiuXZDCwU2lKQFsoSCo72j3HqBK9d81N2M=
 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/sylabs/json-resp v0.5.0 h1:AWdKu6aS0WrkkltX1M0ex0lENrIcx5TISox902s2L2M=