tail-cf-plugin 0.0.13.pre → 0.0.14.pre

data/lib/tail-cf-plugin/loggregator_client.rb

@@ -1,35 +1,32 @@
+require 'celluloid/websocket/client'
+
 module TailCfPlugin
   class LoggregatorClient
+    include Celluloid
+
     def initialize(output)
       @output = output
     end
 
     def listen(loggregator_host, space_id, app_id, user_token)
-      address = "#{loggregator_host}/tail/spaces/#{space_id}"
-      address += "/apps/#{app_id}" if app_id
-
-      address += "?authorization=#{URI.encode(user_token)}"
-
-      uri = URI.parse(address)
-      http = Net::HTTP.new(uri.host, uri.port)
-      if uri.scheme == 'https'
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-
-      request = Net::HTTP::Get.new uri.request_uri
-      output.puts "Connected to #{loggregator_host}"
-      http.request request do |response|
-        case response.code.to_i
-          when 200
-            response.read_body do |chunk|
-              received_message = LogMessage.decode(chunk)
-              output.puts([received_message.app_id, received_message.source_id, received_message.message_type_name, received_message.message].join(" "))
-            end
-          else
-            output.puts("Error #{response.code}: #{response.body}")
-        end
-      end
+      websocket_address = "ws://#{loggregator_host}/tail/spaces/#{space_id}"
+      websocket_address += "/apps/#{app_id}" if app_id
+      websocket_address += "?authorization=#{URI.encode(user_token)}"
+
+      @client = Celluloid::WebSocket::Client.new(websocket_address, current_actor, headers: {"Origin" => "http://localhost" })
+    end
+
+    def on_open
+      output.puts("Connected to server.")
+    end
+
+    def on_message(data)
+      received_message = LogMessage.decode(data.pack("C*"))
+      output.puts([received_message.app_id, received_message.source_id, received_message.message_type_name, received_message.message].join(" "))
+    end
+
+    def on_close(code, reason)
+      output.puts("Server dropped connection...goodbye. #{code} #{reason}")
     end
 
     private

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

@@ -3,7 +3,6 @@ require 'cf'
 module TailCfPlugin
   require 'tail-cf-plugin/loggregator_client'
   require 'log_message/log_message.pb'
-  require 'uri'
 
   class Plugin < CF::CLI
     include LoginRequirements
@@ -26,6 +25,7 @@ module TailCfPlugin
 
       loggregator_client = LoggregatorClient.new(STDOUT)
       loggregator_client.listen(loggregator_host, client.current_space.guid, app_guid, client.token.auth_header)
+      wait_for_ws_connection_close
     end
 
     ::ManifestsPlugin.default_to_app_from_manifest(:tail, false)
@@ -33,9 +33,12 @@ module TailCfPlugin
     private
 
     def loggregator_host
-      url = URI.parse(client.target)
-      domain = url.host.split(".")[1..-1].join(".")
-      "#{url.scheme}://loggregator.#{domain}"
+      target_base = client.target.sub(/^https?:\/\/([^\.]+\.)?(.+)\/?/, '\2')
+      "loggregator.#{target_base}"
+    end
+
+    def wait_for_ws_connection_close
+      sleep
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tail-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.13.pre
+  version: 0.0.14.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf
@@ -49,6 +49,86 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.7
+- !ruby/object:Gem::Dependency
+  name: celluloid-websocket-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faye-websocket
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CF command line tool to tail CF Application Logs
 email:
 - vcap-dev@googlegroups.com