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

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

@@ -0,0 +1,13 @@
+module LogsCfPlugin
+  class ClientConfig
+    attr_reader :loggregator_host, :user_token, :output, :trace, :use_ssl
+
+    def initialize(loggregator_host, user_token, output, trace, use_ssl = true)
+      @output = output
+      @loggregator_host = loggregator_host
+      @user_token = user_token
+      @trace = trace
+      @use_ssl = use_ssl
+    end
+  end
+end

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

@@ -6,7 +6,9 @@ require 'uri'
 
 module LogsCfPlugin
   require 'logs-cf-plugin/message_writer'
-  require 'logs-cf-plugin/loggregator_client'
+  require 'logs-cf-plugin/client_config'
+  require 'logs-cf-plugin/tailing_logs_client'
+  require 'logs-cf-plugin/recent_logs_client'
 
   class Plugin < CF::CLI
     include LoginRequirements
@@ -25,13 +27,10 @@ module LogsCfPlugin
         fail "Please provide an application to log."
       end
 
-      loggregator_client = LoggregatorClient.new(loggregator_host, client.token.auth_header, STDOUT, input[:trace], use_ssl)
+      client_config = ClientConfig.new(loggregator_host, client.token.auth_header, STDOUT, input[:trace], use_ssl)
 
-      if input[:recent]
-        loggregator_client.dump_messages(input[:app])
-      else
-        loggregator_client.listen(input[:app])
-      end
+      client_clazz = input[:recent] ? RecentLogsClient : TailingLogsClient
+      client_clazz.new(client_config).logs_for(input[:app])
     end
 
     ::ManifestsPlugin.default_to_app_from_manifest(:logs, false)

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

@@ -0,0 +1,96 @@
+module LogsCfPlugin
+  class RecentLogsClient
+    include CFoundry::TraceHelpers
+    include MessageWriter
+
+    def initialize(config)
+      @config = config
+    end
+
+    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
+
+      response_bytes = StringIO.new(response.body)
+      messages = []
+      while len = response_bytes.read(4)
+        len = len.unpack("N")[0] # 32-bit length, BigEndian stylie
+        record = response_bytes.read(len) # This returns a string even if len is 0.
+        msg = LogMessage.decode(record)
+        messages << msg
+      end
+
+      if trace
+        response_hash = {
+            :headers => sane_headers(response),
+            :status => response.code,
+            :body => messages
+        }
+        output.puts(response_trace(response_hash))
+      end
+
+      messages.each do |m|
+        write(app, output, m)
+      end
+    rescue Beefcake::Message::WrongTypeError, Beefcake::Message::RequiredFieldNotSetError, Beefcake::Message::InvalidValueError
+      output.puts("Error parsing data. Please ensure your gem is the latest version.")
+    end
+
+    private
+
+    attr_reader :config
+
+    delegate :output, :loggregator_host, :user_token, :trace, :use_ssl,
+             to: :config
+
+    def make_dump_request(uri)
+      uri = URI.parse(uri)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = use_ssl
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      request = Net::HTTP::Get.new(uri.request_uri)
+      request['Authorization'] = user_token
+
+      if trace
+        request_hash = {
+            :url => uri.to_s,
+            :method => "GET",
+            :headers => sane_headers(request),
+            :body => ""
+        }
+        output.puts(request_trace(request_hash))
+      end
+
+      response = http.request(request)
+response
+    end
+
+    def sane_headers(obj)
+      hds = {}
+
+      obj.each_header do |k, v|
+        hds[k] = v
+      end
+
+      hds
+    end
+  end
+end

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

@@ -0,0 +1,73 @@
+module LogsCfPlugin
+  class TailingLogsClient
+    #include CFoundry::TraceHelpers
+    include MessageWriter
+
+    def initialize(config)
+      @config = config
+    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
+
+      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})
+
+        ws.on :open do |event|
+          output.puts("Connected to server.")
+          EventMachine.add_periodic_timer(keep_alive_interval) do
+            ws.send([42])
+          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
+          end
+        end
+
+        ws.on :error do |event|
+          @config.output.puts("Server error")
+          @config.output.puts(event.data.inspect) if trace
+        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.")
+          end
+          @config.output.puts("Server dropped connection...goodbye.")
+          EM.stop
+          ws = nil
+        end
+      }
+    end
+
+    private
+
+    attr_reader :config
+
+    delegate :output, :loggregator_host, :user_token, :trace, :use_ssl,
+             to: :config
+
+    def keep_alive_interval
+      25
+    end
+  end
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: logs-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.38.pre
+  version: 0.0.39.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: loggregator_messages
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -73,33 +82,36 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/logs-cf-plugin/loggregator_client.rb
+- lib/logs-cf-plugin/client_config.rb
 - lib/logs-cf-plugin/message_writer.rb
 - lib/logs-cf-plugin/plugin.rb
+- lib/logs-cf-plugin/recent_logs_client.rb
+- lib/logs-cf-plugin/tailing_logs_client.rb
 - README.md
 homepage: http://github.com/cloudfoundry/logs-cf-plugin
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - vendor
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: CF Logs
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjE3ZDZkYmZmMGY0YzljNGMxNDFjNDcxY2Y4YmVkY2MzNDU5NmNiMw==
-  data.tar.gz: !binary |-
-    ZmUxMWYxM2MwNzg3NGIxZjk3YTA2OGJlNGE2YWVmM2VjMWZkODUyZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YTg1YWI4MzI3YjYzNWExNGZjMjhhZWIxMjVmN2Y3ZTE1ZWJmOTQ2YTkyZjMz
-    YzcxNTQxMjY1ZDlmYTE3ZGIzZTMyOWI1MjM1YzBhM2E2ZTk2OWNmODBlZjUy
-    Nzk4N2Q1ZjY3MzhkYzY4OGYzYzQ5MGU5MmIyYzhjOWYxMWNiYzM=
-  data.tar.gz: !binary |-
-    NWEwMWE3ZWFlMWViMzlkZWE1ZDRhOGY4MmJkZjI2NGQxZmQyYTZkMTZhNzVi
-    ODkxMDY1MzA5ZWYyNTk0OGYwN2VlYjdhYmExZDY2YTQzODkwOGMzNjc2YzE5
-    MmQzYjQwNmZmNDQ1NDI2OGQ1N2VjZjE3OGI4ZDFlMWQ3ZmI5YmI=

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

@@ -1,150 +0,0 @@
-module LogsCfPlugin
-  class LoggregatorClient
-    include CFoundry::TraceHelpers
-    include MessageWriter
-
-    def initialize(loggregator_host, user_token, output, trace, use_ssl = true)
-      @output = output
-      @loggregator_host = loggregator_host
-      @user_token = user_token
-      @trace = trace
-      @use_ssl = use_ssl
-    end
-
-    def listen(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
-
-      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})
-
-        ws.on :open do |event|
-          output.puts("Connected to server.")
-          EventMachine.add_periodic_timer(keep_alive_interval) do
-            ws.send([42])
-          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
-          end
-        end
-
-        ws.on :error do |event|
-          output.puts("Server error")
-          output.puts(event.data.inspect) if trace
-        end
-
-        ws.on :close do |event|
-          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.stop
-          ws = nil
-        end
-      }
-    end
-
-    def dump_messages(app)
-      prefix = use_ssl ? 'https' : 'http'
-      uri = URI.parse("#{prefix}://#{loggregator_host}/dump/?app=#{app.guid}")
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = use_ssl
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-      request = Net::HTTP::Get.new(uri.request_uri)
-      request['Authorization'] = user_token
-
-      if trace
-        request_hash = {
-          :url => uri.request_uri,
-          :method => "GET",
-          :headers => sane_headers(request),
-          :body => ""
-        }
-        output.puts(request_trace(request_hash))
-      end
-
-      response = http.request(request)
-
-      case response.code
-        when "200"
-          # fall thru
-        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
-
-      response_bytes = StringIO.new(response.body)
-      messages = []
-      while len = response_bytes.read(4)
-        len = len.unpack("N")[0] # 32-bit length, BigEndian stylie
-        record = response_bytes.read(len) # This returns a string even if len is 0.
-        msg = LogMessage.decode(record)
-        messages << msg
-      end
-
-      if trace
-        response_hash = {
-          :headers => sane_headers(response),
-          :status => response.code,
-          :body => messages
-        }
-        output.puts(response_trace(response_hash))
-      end
-
-      messages.each do |m|
-        write(app, output, m)
-      end
-    rescue Beefcake::Message::WrongTypeError, Beefcake::Message::RequiredFieldNotSetError, Beefcake::Message::InvalidValueError
-      output.puts("Error parsing data. Please ensure your gem is the latest version.")
-      []
-    end
-
-    private
-
-    def sane_headers(obj)
-      hds = {}
-
-      obj.each_header do |k, v|
-        hds[k] = v
-      end
-
-      hds
-    end
-
-    def keep_alive_interval
-      25
-    end
-
-    def hash_to_query(hash)
-      return URI.encode(hash.map { |k, v| "#{k}=#{v}" }.join("&"))
-    end
-
-    attr_reader :output, :loggregator_host, :user_token, :trace, :use_ssl
-  end
-end