Merge lp:~rvb/gwacl/add-debug into lp:gwacl

[Raphaël Badin]

Add option to print debugging output.

A bit ugly to have a module-level boolean but it's much simpler compared to always having to pass around the value of the 'verbose' boolean.

[Jeroen T. Vermeulen (jtv)]

If you're going to mix log.Printf and log.Println, you might use log.Printf here as well:

+ log.Println("Request body: " + string(request.Payload))

(x509dispatcher.go ine 84 or so, in performX509CurlRequest)

review: Approve

[lp:~rvb/gwacl/add-debug]

37. By Raphaël Badin on 2013-03-21

Review change.

[Raphaël Badin (rvb)]

> If you're going to mix log.Printf and log.Println, you might use log.Printf
> here as well:
>
> + log.Println("Request body: " + string(request.Payload))
>
> (x509dispatcher.go ine 84 or so, in performX509CurlRequest)

Done!

=== modified file 'example/live_example_managementapi.go'
--- example/live_example_managementapi.go	2013-03-21 00:09:06 +0000
+++ example/live_example_managementapi.go	2013-03-21 02:43:24 +0000
@@ -16,12 +16,13 @@
 )
 
 var certFile string
-
 var subscriptionID string
+var verbose bool
 
 func getParams() {
     flag.StringVar(&certFile, "cert", "my-azure.pem", "Name of your management certificate file (in PEM format)")
     flag.StringVar(&subscriptionID, "subscriptionid", "", "Your Azure subscription ID")
+    flag.BoolVar(&verbose, "verbose", false, "Print debugging output")
     flag.Parse()
 }
 
@@ -35,6 +36,7 @@
     getParams()
 
     api, err := gwacl.NewManagementAPI(subscriptionID, certFile)
+    gwacl.SetVerbose(true)
     checkError(err)
 
     // Exercise the API.
 
=== modified file 'x509dispatcher.go'
--- x509dispatcher.go	2013-03-20 23:53:03 +0000
+++ x509dispatcher.go	2013-03-21 02:43:24 +0000
@@ -3,6 +3,7 @@
 import (
     "fmt"
     curl "github.com/andelf/go-curl"
+    "log"
 )
 
 type X509Request struct {
@@ -13,6 +14,13 @@
     ContentType string
 }
 
+// Print debugging output.
+var verbose = false
+
+func SetVerbose(newVerbose bool) {
+    verbose = newVerbose
+}
+
 // baseAPIVersion is the default Azure API version to use.
 const baseAPIVersion = "2012-03-01"
 
@@ -69,6 +77,12 @@
 }
 
 func performX509CurlRequest(session *X509Session, request *X509Request) (*X509Response, error) {
+    if verbose {
+        log.Println("Performing request")
+        log.Println("Request url: " + request.URL)
+        log.Println("Request method: " + request.Method)
+        log.Printf("Request body: %s\n", request.Payload)
+    }
     response := newX509Response()
     ch := request.makeCurlRequest(session, response)
     defer ch.Cleanup()
@@ -86,6 +100,11 @@
         return nil, err
     }
     response.StatusCode = status.(int)
+    if verbose {
+        log.Println("Got response")
+        log.Printf("Response status: %d\n", response.StatusCode)
+        log.Printf("Response body: %s\n", response.Body)
+    }
     return response, nil
 }