send sk

frequalize · Oct 25, 2011 · 0ad524b · 0ad524b
1 parent 3babd20
commit 0ad524b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/lib/fz/numerics/cli.coffee b/lib/fz/numerics/cli.coffee
@@ -179,8 +179,8 @@ class CLI
         @json_mode = true
 
   error: (err) ->
-    process.stderr.write('Error: ' + err)
+    console.error('Error: ' + err)
-    process.stderr.write("\n")
+    process.exit(1)
 
   success: (data) ->
     if @json_mode
@@ -245,8 +245,7 @@ class CLI
 
   connection: () ->
     if !@key?
-      console.error "No key or project set"
+      this.error("No key or project set")
-      process.exit(1)
     @conn ||= new Connection(@key)
 
   version: () ->
@@ -303,7 +302,7 @@ class CLI
                         stats   emits the version data and stats whenever the stats change
 
                        General options:
-                         -h                                      JSON output
+                         -j                                      JSON output @@??##todo
                          -h                                      display this and exit
                          -v(v)                                   (extra) verbose logging
                          -V                                      print version and exit

diff --git a/lib/fz/numerics/cli.js b/lib/fz/numerics/cli.js
diff --git a/lib/fz/numerics/connection.coffee b/lib/fz/numerics/connection.coffee
@@ -184,7 +184,8 @@ class Connection
           err = 'invalid server response'
         done()
 
-    request.setHeader('X-Access-Key', @access_key.key) ##@@ todo -signing
+    request.setHeader('X-Access-Key', @access_key.key)
+    request.setHeader('X-Secret-Key', @access_key.secret_key) ##@@ todo -- only if HTTPS!!!
     if false ##@@ todo - support keep_alive
       request.setHeader('Connection', 'Keep-Alive')
     else

diff --git a/lib/fz/numerics/connection.js b/lib/fz/numerics/connection.js