Fixes #4 #5

sphereio · Feb 27, 2014 · a6fdf6b · a6fdf6b
1 parent e657269
commit a6fdf6b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/coffee/oauth2.coffee b/src/coffee/oauth2.coffee
@@ -42,13 +42,13 @@ class OAuth2
       timeout: @_options.timeout
       rejectUnauthorized: @_options.rejectUnauthorized
 
-    @logger.info 'Retrieving access_token...'
+    @logger.debug request_options, 'Retrieving access_token...'
     @_doRequest(request_options, callback)
 
   _doRequest: (options, callback) ->
     request options, (e, r, b) =>
       @logger.error e if e
-      @logger.debug request: r.request, response: r, 'OAuth response'
+      @logger.debug {request: r.request, response: r}, 'OAuth response'
       callback(e, r, b)
 
 ###

diff --git a/src/coffee/rest.coffee b/src/coffee/rest.coffee
@@ -38,25 +38,28 @@ class Rest
     return
 
   GET: (resource, callback) ->
-    @logger.info "Project '#{@_options.config.project_key}'", 'GET', resource
     params =
-      resource: resource
       method: 'GET'
+      resource: resource
+    @logger.debug _.extend {}, params,
+      project: @_options.config.project_key
     @_preRequest(params, callback)
 
   POST: (resource, payload, callback) ->
-    @logger.info "Project '#{@_options.config.project_key}'", 'POST', resource, payload
     params =
-      resource: resource
       method: 'POST'
+      resource: resource
       body: payload
+    @logger.debug _.extend {}, params,
+      project: @_options.config.project_key
     @_preRequest(params, callback)
 
   DELETE: (resource, callback) ->
-    @logger.info "Project '#{@_options.config.project_key}'", 'DELETE', resource
     params =
-      resource: resource
       method: 'DELETE'
+      resource: resource
+    @logger.debug _.extend {}, params,
+      project: @_options.config.project_key
     @_preRequest(params, callback)
 
   PUT: -> throw new Error 'Not implemented yet'
@@ -85,7 +88,7 @@ class Rest
             access_token = body.access_token
             @_options.access_token = access_token
             @_options.headers['Authorization'] = "Bearer #{@_options.access_token}"
-            @logger.info 'New access_token received', access_token
+            @logger.debug 'New access_token received', access_token
             # call itself again (this time with the access_token)
             _req(0)
       else
@@ -107,7 +110,7 @@ class Rest
   _doRequest: (options, callback) ->
     request options, (e, r, b) =>
       @logger.error e if e
-      @logger.debug request: r.request, response: r, 'Rest response'
+      @logger.debug {request: r.request, response: r}, 'Rest response'
       callback(e, r, b)
 
 ###