Merge pull request #18 from DexterHaslem/add-log-target

Add log target

Author: diwakergupta

generator/go_client.stoneg.py

@@ -104,8 +104,8 @@ def _generate_request(self, namespace, route):
 
         body = 'nil'
         if not is_void_type(route.arg_data_type):
-            with self.block('if dbx.Config.Verbose'):
-                out('log.Printf("arg: %v", arg)')
+            out('dbx.Config.TryLog("arg: %v", arg)')
+
             out('b, err := json.Marshal(arg)')
             with self.block('if err != nil'):
                 out('return')
@@ -138,21 +138,22 @@ def _generate_request(self, namespace, route):
             host, style, authed, namespace.name, route.name, body))
         with self.block('if err != nil'):
             out('return')
-        with self.block('if dbx.Config.Verbose'):
-            out('log.Printf("req: %v", req)')
+
+        out('dbx.Config.TryLog("req: %v", req)')
+
         out()
 
     def _generate_post(self):
         out = self.emit
 
         out('resp, err := cli.Do(req)')
-        with self.block('if dbx.Config.Verbose'):
-            out('log.Printf("resp: %v", resp)')
 
         with self.block('if err != nil'):
             out('return')
         out()
 
+        out('dbx.Config.TryLog("resp: %v", resp)')
+
     def _generate_response(self, route):
         out = self.emit
         style = route.attrs.get('style', 'rpc')
@@ -165,8 +166,8 @@ def _generate_response(self, route):
                             'if err != nil'):
                 out('return')
             out()
-        with self.block('if dbx.Config.Verbose'):
-            out('log.Printf("body: %s", body)')
+
+        out('dbx.Config.TryLog("body: %v", body)')
 
     def _generate_error_handling(self, route):
         out = self.emit

generator/go_helpers.py

@@ -126,6 +126,7 @@ def generate_doc(code_generator, t):
                 d += 'Use `%s` instead' % fmt_var(t.deprecated.by.name)
             code_generator.emit_wrapped_text(d, prefix='// ')
 
+
 def _needs_base_type(data_type):
     if is_struct_type(data_type) and data_type.has_enumerated_subtypes():
         return True

generator/go_rsrc/sdk.go

@@ -23,6 +23,7 @@ package dropbox
 import (
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 
 	"golang.org/x/oauth2"
@@ -49,6 +50,8 @@ type Config struct {
 	Token string
 	// Enable verbose logging in SDK
 	Verbose bool
+	// Logging target for verbose SDK logging
+	Logger *log.Logger
 	// Used with APIs that support operations as another user
 	AsMemberID string
 	// No need to set -- for testing only
@@ -61,6 +64,19 @@ type Config struct {
 	URLGenerator func(hostType string, style string, namespace string, route string) string
 }
 
+// TryLog will, if Verbose is set, log to the config's logger
+// or the default log (stderr) if Config.Logger is nil.
+func (c *Config) TryLog(format string, v ...interface{}) {
+	if !c.Verbose {
+		return
+	}
+	if c.Logger != nil {
+		c.Logger.Printf(format, v...)
+	} else {
+		log.Printf(format, v...)
+	}
+}
+
 // Context is the base client context used to implement per-namespace clients.
 type Context struct {
 	Config          Config