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

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjU0ZWQ0Y2IwNDExMWIwM2E4MmZjYTI1NGY5ZmYxYTRkODBlOGY1ZQ==
+    ZjE3ZDZkYmZmMGY0YzljNGMxNDFjNDcxY2Y4YmVkY2MzNDU5NmNiMw==
   data.tar.gz: !binary |-
-    NjlkNzViMTA4OGNjNDQ5ZGY2NDExNTExZWJhY2E2ZDMzOGQxOTRmOA==
+    ZmUxMWYxM2MwNzg3NGIxZjk3YTA2OGJlNGE2YWVmM2VjMWZkODUyZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjgxZjBjN2Y4MDU3NTJkZWFiMDU0MjZiNGM2NjliZGYxMmQwZWQzNTg2NWNh
-    MDJiOTk0M2ZlYjcyYTk0ZjcyMDJlMDk4MDU2MDM4NDczYTExMWFkM2Y1ZDli
-    NjYwNjJmZWFiMzJjNjIyZThhNzA4NjY3MGQxODZiMWM0MDI4NDA=
+    YTg1YWI4MzI3YjYzNWExNGZjMjhhZWIxMjVmN2Y3ZTE1ZWJmOTQ2YTkyZjMz
+    YzcxNTQxMjY1ZDlmYTE3ZGIzZTMyOWI1MjM1YzBhM2E2ZTk2OWNmODBlZjUy
+    Nzk4N2Q1ZjY3MzhkYzY4OGYzYzQ5MGU5MmIyYzhjOWYxMWNiYzM=
   data.tar.gz: !binary |-
-    YjcwNWY1YzUwZTZhYmE5YjA5ZGY0MmI5YzZjZjk1OWFkOGU1Nzc3ZmViYThl
-    MGJjYTIzZTU5OTA2NjQ5OTJjOTZhZWUxYzUxNDdkZmZhMTU0YTAyMGFkZTgy
-    YTNmZDJlOTNjOGUwZmI5Y2IyNTdhOGYxN2U3OTU0M2E0YzE5MzE=
+    NWEwMWE3ZWFlMWViMzlkZWE1ZDRhOGY4MmJkZjI2NGQxZmQyYTZkMTZhNzVi
+    ODkxMDY1MzA5ZWYyNTk0OGYwN2VlYjdhYmExZDY2YTQzODkwOGMzNjc2YzE5
+    MmQzYjQwNmZmNDQ1NDI2OGQ1N2VjZjE3OGI4ZDFlMWQ3ZmI5YmI=

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

@@ -11,11 +11,11 @@ module LogsCfPlugin
       @use_ssl = use_ssl
     end
 
-    def listen(log_target)
+    def listen(app)
       if use_ssl
-        websocket_address = "wss://#{loggregator_host}:4443/tail/?#{hash_to_query(log_target.query_params)}"
+        websocket_address = "wss://#{loggregator_host}:4443/tail/?app=#{app.guid}"
       else
-        websocket_address = "ws://#{loggregator_host}/tail/?#{hash_to_query(log_target.query_params)}"
+        websocket_address = "ws://#{loggregator_host}/tail/?app=#{app.guid}"
       end
 
       output.puts "websocket_address: #{websocket_address}" if trace
@@ -33,8 +33,8 @@ module LogsCfPlugin
         ws.on :message do |event|
           begin
             received_message = LogMessage.decode(event.data.pack("C*"))
-            write(log_target, output, received_message)
-          rescue Beefcake::Message::WrongTypeError, Beefcake::Message::RequiredFieldNotSetError,  Beefcake::Message::InvalidValueError
+            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
@@ -63,9 +63,9 @@ module LogsCfPlugin
       }
     end
 
-    def dump_messages(log_target)
+    def dump_messages(app)
       prefix = use_ssl ? 'https' : 'http'
-      uri = URI.parse("#{prefix}://#{loggregator_host}/dump/?#{hash_to_query(log_target.query_params)}")
+      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
@@ -75,10 +75,10 @@ module LogsCfPlugin
 
       if trace
         request_hash = {
-            :url => uri.request_uri,
-            :method => "GET",
-            :headers => sane_headers(request),
-            :body => ""
+          :url => uri.request_uri,
+          :method => "GET",
+          :headers => sane_headers(request),
+          :body => ""
         }
         output.puts(request_trace(request_hash))
       end
@@ -92,7 +92,7 @@ module LogsCfPlugin
           output.puts("Unauthorized")
           return
         when "404"
-          output.puts("App #{log_target.app_name} not found")
+          output.puts("App #{app.name} not found")
           return
         else
           output.puts("Error connecting to server #{response.code}")
@@ -110,15 +110,15 @@ module LogsCfPlugin
 
       if trace
         response_hash = {
-            :headers => sane_headers(response),
-            :status => response.code,
-            :body => messages
+          :headers => sane_headers(response),
+          :status => response.code,
+          :body => messages
         }
         output.puts(response_trace(response_hash))
       end
 
       messages.each do |m|
-        write(log_target, output, 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.")

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

@@ -2,8 +2,9 @@ require "cf/cli"
 
 module MessageWriter
   include CF::Interactive
-  def write(log_target, output, message)
-    msg = [log_target.app_name, message.source_type_name, message.source_id, message.message_type_name, message.message].join(" ")
+
+  def write(app, output, message)
+    msg = [app.name, message.source_type_name, message.source_id, message.message_type_name, message.message].join(" ")
     msg = c(msg.chomp, :error) if message.message_type == LogMessage::MessageType::ERR
     output.puts(msg)
   end

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

@@ -5,7 +5,6 @@ require 'loggregator_messages'
 require 'uri'
 
 module LogsCfPlugin
-  require 'logs-cf-plugin/log_target'
   require 'logs-cf-plugin/message_writer'
   require 'logs-cf-plugin/loggregator_client'
 
@@ -21,10 +20,7 @@ module LogsCfPlugin
     def logs
       client.current_organization.name # resolve org name so CC will validate AuthToken
 
-
-      log_target = LogTarget.new(input[:app])
-
-      unless log_target.valid?
+      unless input[:app]
         Mothership::Help.command_help(@@commands[:logs])
         fail "Please provide an application to log."
       end
@@ -32,9 +28,9 @@ module LogsCfPlugin
       loggregator_client = LoggregatorClient.new(loggregator_host, client.token.auth_header, STDOUT, input[:trace], use_ssl)
 
       if input[:recent]
-        loggregator_client.dump_messages(log_target)
+        loggregator_client.dump_messages(input[:app])
       else
-        loggregator_client.listen(log_target)
+        loggregator_client.listen(input[:app])
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logs-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.37.pre
+  version: 0.0.38.pre
 platform: ruby
 authors:
 - Pivotal
@@ -73,7 +73,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/logs-cf-plugin/log_target.rb
 - lib/logs-cf-plugin/loggregator_client.rb
 - lib/logs-cf-plugin/message_writer.rb
 - lib/logs-cf-plugin/plugin.rb

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

@@ -1,29 +0,0 @@
-module LogsCfPlugin
-  class LogTarget
-    def initialize(app)
-      @app = app
-    end
-
-    def valid?
-      !app_id.nil?
-    end
-
-    def query_params
-      {app: app_id}
-    end
-
-    def app_id
-      @app.try(:guid)
-    end
-
-    def app_name
-      @app.try(:name)
-    end
-
-    private
-
-    def target
-      :app if app_id
-    end
-  end
-end