use a helper in gocode (TryLog) instead, simplify gen

Author: DexterHaslem

generator/go_client.stoneg.py

@@ -11,7 +11,6 @@
     fmt_type,
     fmt_var,
     generate_doc,
-    generate_if_else,
 )
 
 
@@ -99,12 +98,7 @@ def _generate_request(self, namespace, route):
 
         body = 'nil'
         if not is_void_type(route.arg_data_type):
-            with self.block('if dbx.Config.Verbose'):
-                generate_if_else(self,
-                    'dbx.Config.Logger != nil',
-                        'dbx.Config.Logger.Printf("arg: %v", arg)',
-                    'log.Printf("arg: %v", arg)')
-            out()
+            out('dbx.Config.TryLog("arg: %v", arg)')
 
             out('b, err := json.Marshal(arg)')
             with self.block('if err != nil'):
@@ -139,28 +133,21 @@ def _generate_request(self, namespace, route):
         with self.block('if err != nil'):
             out('return')
 
-        with self.block('if dbx.Config.Verbose'):
-            generate_if_else(self,
-                'dbx.Config.Logger != nil',
-                    'dbx.Config.Logger.Printf("req: %v", req)',
-                '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'):
-            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')
         out()
 
+        out('dbx.Config.TryLog("resp: %v", resp)')
+
     def _generate_response(self, route):
         out = self.emit
         style = route.attrs.get('style', 'rpc')
@@ -173,12 +160,8 @@ def _generate_response(self, route):
                             'if err != nil'):
                 out('return')
             out()
-        with self.block('if dbx.Config.Verbose'):
-            generate_if_else(self,
-                'dbx.Config.Logger != nil',
-                    'dbx.Config.Logger.Printf("body: %v", body)',
-                'log.Printf("body: %v", body)')
-        out()
+
+        out('dbx.Config.TryLog("body: %v", body)')
 
     def _generate_error_handling(self, route):
         out = self.emit

generator/go_helpers.py

@@ -118,13 +118,6 @@ 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():
         return True

generator/go_rsrc/sdk.go

@@ -64,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