logs-cf-plugin 0.0.39.pre → 0.0.40.pre

data/lib/logs-cf-plugin/client_config.rb

@@ -1,10 +1,11 @@
 module LogsCfPlugin
   class ClientConfig
-    attr_reader :loggregator_host, :user_token, :output, :trace, :use_ssl
+    attr_reader :loggregator_host, :loggregator_port, :user_token, :output, :trace, :use_ssl
 
-    def initialize(loggregator_host, user_token, output, trace, use_ssl = true)
+    def initialize(loggregator_host, loggregator_port, user_token, output, trace, use_ssl = true)
       @output = output
       @loggregator_host = loggregator_host
+      @loggregator_port = loggregator_port
       @user_token = user_token
       @trace = trace
       @use_ssl = use_ssl

data/lib/logs-cf-plugin/plugin.rb

@@ -26,8 +26,8 @@ module LogsCfPlugin
         Mothership::Help.command_help(@@commands[:logs])
         fail "Please provide an application to log."
       end
-
-      client_config = ClientConfig.new(loggregator_host, client.token.auth_header, STDOUT, input[:trace], use_ssl)
+      port = input[:recent] ? nil : 4443
+      client_config = ClientConfig.new(loggregator_host, port, client.token.auth_header, STDOUT, input[:trace], use_ssl)
 
       client_clazz = input[:recent] ? RecentLogsClient : TailingLogsClient
       client_clazz.new(client_config).logs_for(input[:app])

data/lib/logs-cf-plugin/recent_logs_client.rb

@@ -9,24 +9,9 @@ module LogsCfPlugin
 
     def logs_for(app)
       prefix = use_ssl ? 'https' : 'http'
-      uri = "#{prefix}://#{loggregator_host}/dump/?app=#{app.guid}"
-      response = make_dump_request(uri)
-
-      case response.code
-        when "200"
-        # fall thru
-        when "302"
-          response = make_dump_request(response['location'])
-        when "401"
-          output.puts("Unauthorized")
-          return
-        when "404"
-          output.puts("App #{app.name} not found")
-          return
-        else
-          output.puts("Error connecting to server #{response.code}")
-          return
-      end
+      uri = "#{prefix}://#{loggregator_host}#{loggregator_port ? ":#{loggregator_port}" : ""}/dump/?app=#{app.guid}"
+      response = make_dump_request(uri, app)
+      return unless response
 
       response_bytes = StringIO.new(response.body)
       messages = []
@@ -57,10 +42,10 @@ module LogsCfPlugin
 
     attr_reader :config
 
-    delegate :output, :loggregator_host, :user_token, :trace, :use_ssl,
+    delegate :output, :loggregator_host, :loggregator_port, :user_token, :trace, :use_ssl,
              to: :config
 
-    def make_dump_request(uri)
+    def make_dump_request(uri, app)
       uri = URI.parse(uri)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = use_ssl
@@ -80,7 +65,23 @@ module LogsCfPlugin
       end
 
       response = http.request(request)
-response
+
+      case response.code
+        when "200"
+          return response
+        when "302"
+          response = make_dump_request(response['location'], app)
+          return response
+        when "401"
+          output.puts("Unauthorized")
+          return
+        when "404"
+          output.puts("App #{app.name} not found")
+          return
+        else
+          output.puts("Error connecting to server #{response.code}")
+          return
+      end
     end
 
     def sane_headers(obj)

data/lib/logs-cf-plugin/tailing_logs_client.rb

@@ -8,62 +8,86 @@ module LogsCfPlugin
     end
 
     def logs_for(app)
-      if use_ssl
-        websocket_address = "wss://#{loggregator_host}:4443/tail/?app=#{app.guid}"
-      else
-        websocket_address = "ws://#{loggregator_host}/tail/?app=#{app.guid}"
-      end
+      protocol = use_ssl ? "wss" : "ws"
+      websocket_address = "#{protocol}://#{loggregator_host}#{loggregator_port ? ":#{loggregator_port}" : ""}/tail/?app=#{app.guid}"
 
       output.puts "websocket_address: #{websocket_address}" if trace
 
-      EM.run {
-        ws = Faye::WebSocket::Client.new(websocket_address, nil, :headers => {"Origin" => "http://localhost", "Authorization" => user_token})
+      make_websocket_request(app, websocket_address)
+    end
 
-        ws.on :open do |event|
-          output.puts("Connected to server.")
-          EventMachine.add_periodic_timer(keep_alive_interval) do
-            ws.send([42])
+    def make_websocket_request(app, websocket_address)
+      redirect_uri = nil
+      @em_client_thread = Thread.new do
+        EM.run {
+          ws = Faye::WebSocket::Client.new(websocket_address, nil, :headers => {"Origin" => "http://localhost", "Authorization" => user_token})
+          ws.on :open do |event|
+            output.puts("Connected to server.")
+            EventMachine.add_periodic_timer(keep_alive_interval) do
+              ws.send([42])
+            end
           end
-        end
 
-        ws.on :message do |event|
-          begin
-            received_message = LogMessage.decode(event.data.pack("C*"))
-            write(app, output, received_message)
-          rescue Beefcake::Message::WrongTypeError, Beefcake::Message::RequiredFieldNotSetError, Beefcake::Message::InvalidValueError
-            output.puts("Error parsing data. Please ensure your gem is the latest version.")
-            ws.close
-            EM.stop
+          ws.on :message do |event|
+            begin
+              received_message = LogMessage.decode(event.data.pack("C*"))
+              write(app, output, received_message)
+            rescue Beefcake::Message::WrongTypeError, Beefcake::Message::RequiredFieldNotSetError, Beefcake::Message::InvalidValueError
+              output.puts("Error parsing data. Please ensure your gem is the latest version.")
+              ws.close
+              @em_client_thread.kill
+            end
           end
-        end
 
-        ws.on :error do |event|
-          @config.output.puts("Server error")
-          @config.output.puts(event.data.inspect) if trace
-        end
+          ws.on :error do |event|
+            if !redirect_uri
+              if event.current_target.status == 302
+                redirect_uri = event.current_target.headers["location"]
+                ws.close
+                @em_client_thread.kill
+                ws = nil
+              else
+                output.puts("Server error: #{websocket_address}")
+                output.puts(event.data.inspect) if trace
+              end
+              end
+          end
 
-        ws.on :close do |event|
-          ws.close
-          case event.code
-            when 4000
-              @config.output.puts("Error: No space given.")
-            when 4001
-              @config.output.puts("Error: No authorization token given.")
-            when 4002
-              @config.output.puts("Error: Not authorized.")
+          ws.on :close do |event|
+            unless redirect_uri
+              ws.close
+              case event.code
+                when 4000
+                  output.puts("Error: No space given.")
+                when 4001
+                  output.puts("Error: No authorization token given.")
+                when 4002
+                  output.puts("Error: Not authorized.")
+              end
+              output.puts("Server dropped connection...goodbye.")
+              @em_client_thread.kill
+              ws = nil
+            end
           end
-          @config.output.puts("Server dropped connection...goodbye.")
-          EM.stop
-          ws = nil
-        end
-      }
+        }
+      end
+
+      wait_for_em_thread_to_finish
+
+      make_websocket_request(app, redirect_uri) if redirect_uri
+    end
+
+    def wait_for_em_thread_to_finish
+      while @em_client_thread.alive? do
+        sleep 0.1
+      end
     end
 
     private
 
     attr_reader :config
 
-    delegate :output, :loggregator_host, :user_token, :trace, :use_ssl,
+    delegate :output, :loggregator_host, :loggregator_port, :user_token, :trace, :use_ssl,
              to: :config
 
     def keep_alive_interval

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logs-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.39.pre
+  version: 0.0.40.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf