Merge remote branch 'remotes/upstream/master'

[arvados.git] / bin / google-api

diff --git a/bin/google-api b/bin/google-api
index c6e641113be968c475455dcfbfb2defdabab5db7..c80479e094175d8ec9877b42ad4b815c6f761f75 100755 (executable)
--- a/bin/google-api
+++ b/bin/google-api
@@ -294,13 +294,12 @@ HTML
           exit(0)
         else
           $verifier = nil
-          # TODO(bobaman): Cross-platform?
-          logger = WEBrick::Log.new('/dev/null')
           server = WEBrick::HTTPServer.new(
             :Port => OAUTH_SERVER_PORT,
-            :Logger => logger,
-            :AccessLog => logger
+            :Logger => WEBrick::Log.new,
+            :AccessLog => WEBrick::Log.new
           )
+          server.logger.level = 0
           trap("INT") { server.shutdown }
 
           server.mount("/", OAuthVerifierServlet)
@@ -366,8 +365,8 @@ HTML
           exit(0)
         else
           $verifier = nil
-          # TODO(bobaman): Cross-platform?
-          logger = WEBrick::Log.new('/dev/null')
+          logger = WEBrick::Log.new
+          logger.level = 0
           server = WEBrick::HTTPServer.new(
             :Port => OAUTH_SERVER_PORT,
             :Logger => logger,
@@ -389,7 +388,7 @@ HTML
           )
 
           # Launch browser
-          Launchy::Browser.run(oauth_client.authorization_uri.to_s)
+          Launchy.open(oauth_client.authorization_uri.to_s)
 
           server.start
           oauth_client.code = $verifier