add verbose logging target to Config:

check if it's not nil first so its not a breaking change,
this required an if/else generator to be made

Author: Dexter Haslem

generator/go_client.stoneg.py

@@ -11,6 +11,7 @@
     fmt_type,
     fmt_var,
     generate_doc,
+    generate_if_else,
 )
 
 
@@ -99,7 +100,12 @@ 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)')
+                generate_if_else(self,
+                    'dbx.Config.Logger != nil',
+                        'dbx.Config.Logger.Printf("arg: %v", arg)',
+                    'log.Printf("arg: %v", arg)')
+            out()
+
             out('b, err := json.Marshal(arg)')
             with self.block('if err != nil'):
                 out('return')
@@ -132,16 +138,24 @@ 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)')
+            generate_if_else(self,
+                'dbx.Config.Logger != nil',
+                    'dbx.Config.Logger.Printf("req: %v", req)',
+                'log.Printf("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)')
+            generate_if_else(self,
+                'dbx.Config.Logger != nil',
+                    'dbx.Config.Logger.Printf("resp: %v", resp)',
+                'log.Printf("resp: %v", resp)')
+        out()
 
         with self.block('if err != nil'):
             out('return')
@@ -160,7 +174,11 @@ def _generate_response(self, route):
                 out('return')
             out()
         with self.block('if dbx.Config.Verbose'):
-            out('log.Printf("body: %s", body)')
+            generate_if_else(self,
+                'dbx.Config.Logger != nil',
+                    'dbx.Config.Logger.Printf("body: %v", body)',
+                'log.Printf("body: %v", body)')
+        out()
 
     def _generate_error_handling(self, route):
         out = self.emit

generator/go_helpers.py

@@ -118,6 +118,12 @@ def generate_doc(code_generator, t):
         d = 'Package %s : %s' % (t.name, doc)
     code_generator.emit_wrapped_text(d, prefix='// ')
 
+def generate_if_else(code_generator, ifcond, ifbody, elsebody):
+    with code_generator.block('if %s' % ifcond, after=" else {"):
+        code_generator.emit(ifbody)
+    with code_generator.indent():
+        code_generator.emit(elsebody)
+    code_generator.emit('}')
 
 def _needs_base_type(data_type):
     if is_struct_type(data_type) and data_type.has_enumerated_subtypes():

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