tail-cf-plugin 0.0.11.pre → 0.0.12.pre

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

@@ -0,0 +1,34 @@
+module TailCfPlugin
+  class LoggregatorClient
+    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|
+        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
+      end
+    end
+
+    private
+
+    attr_reader :output
+  end
+end

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

@@ -1,17 +1,15 @@
 require 'cf'
-require 'faye/websocket'
-require 'eventmachine'
 
 module TailCfPlugin
-  require 'tail-cf-plugin/loggregrator_client'
+  require 'tail-cf-plugin/loggregator_client'
   require 'log_message/log_message.pb'
+  require 'uri'
 
   class Plugin < CF::CLI
     include LoginRequirements
 
     desc "Tail logs for CF applications or spaces"
     group :apps
-    input :loggregator_host, :argument => :required, :desc => "The ip:port of the loggregator"
     input :app, :desc => "App to tail logs from", :argument => :optional, :from_given => by_name(:app)
     input :space, :type => :boolean, :desc => "Logs of all apps in the current space", :default => false
 
@@ -26,11 +24,19 @@ module TailCfPlugin
         app_guid = input[:app].guid
       end
 
-      loggregrator_client = LoggregatorClient.new(STDOUT)
-      loggregrator_client.listen(input[:loggregator_host], client.current_space.guid, app_guid, client.token.auth_header)
+      loggregator_client = LoggregatorClient.new(STDOUT)
+      loggregator_client.listen(loggregator_host, client.current_space.guid, app_guid, client.token.auth_header)
     end
 
     ::ManifestsPlugin.default_to_app_from_manifest(:tail, false)
 
+    private
+
+    def loggregator_host
+      url = URI.parse(client.target)
+      domain = url.host.split(".")[1..-1].join(".")
+      "#{url.scheme}://loggregator.#{domain}"
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tail-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.11.pre
+  version: 0.0.12.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf
@@ -33,22 +33,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: faye-websocket
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: beefcake
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +56,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/tail-cf-plugin/loggregrator_client.rb
+- lib/tail-cf-plugin/loggregator_client.rb
 - lib/tail-cf-plugin/plugin.rb
 - vendor/log_message/log_message.pb.rb
 - vendor/log_message/log_message.proto

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

@@ -1,36 +0,0 @@
-module TailCfPlugin
-  class LoggregatorClient
-    def initialize(output)
-      @output = output
-    end
-
-    def listen(loggregator_host, space_id, app_id, user_token)
-      websocket_address = "ws://#{loggregator_host}/tail/spaces/#{space_id}"
-      websocket_address += "/apps/#{app_id}" if app_id
-
-      websocket_address += "?authorization=#{URI.encode(user_token)}"
-
-      EM.run {
-        ws = Faye::WebSocket::Client.new(websocket_address, nil, :headers => {"Origin" => "http://localhost"})
-
-        ws.on :message do |event|
-          received_message = LogMessage.decode(event.data.pack("C*"))
-          output.puts([received_message.app_id, received_message.source_id, received_message.message_type_name, received_message.message].join(" "))
-        end
-
-        ws.on :error do |event|
-          output.puts("Server error")
-        end
-
-        ws.on :close do |event|
-          output.puts("Server dropped connection...goodbye.")
-          EM.stop
-        end
-      }
-    end
-
-    private
-
-    attr_reader :output
-  end
-end