tail-cf-plugin 0.0.21.pre → 0.0.22.pre

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjZlZDcyYjI0YjBkMGExNDRhYjY2MjQ2YzQzODliMWFmZDZmMzZmNw==
+  data.tar.gz: !binary |-
+    ZTI5YjkzNWU0ODJlNjRmZGEyN2JmMWFlODc5MTM0ZTBiNzVmYWM2NQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YzIyMzY3MzE5NDQ4MTkwNDkxZTE4MjNjN2M1Njg5ZDdkODUxYTBjNWQxNjU1
+    ZTBjMWQzOWIxNDcxZTBhMzQ3MTNiNWZlNWJkMDJmNjYyMDI1M2NjM2E0Mjdl
+    MzhiZWU0NTg3NDZhZGFmOTViOWFmYzAwMTljZDJlNTRkODg0NDQ=
+  data.tar.gz: !binary |-
+    N2M1NDE3ZGMyZjExYzJhMjAwYmQ1Njc5ZWFhNTczOTlkZGVhZDhiMWIzOGMy
+    Zjc3MjRkZDkzYTI1NDRiMzk0ZGY2ZDEyOTQ1MWM4Y2RhOTY0MWU4YWRjYzMz
+    ZDdmYzdkZjVmNjhhNTM1OWE1MDU4NGQ0YjE1M2MyMDA4MjI3MmQ=

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

@@ -5,14 +5,18 @@ require 'uri'
 
 module TailCfPlugin
   class LoggregatorClient
-    def initialize(loggregator_host, user_token, output)
+    include CFoundry::TraceHelpers
+
+    def initialize(loggregator_host, user_token, output, trace)
       @output = output
       @loggregator_host = loggregator_host
       @user_token = user_token
+      @trace = trace
     end
 
     def listen(query_params)
       websocket_address = "wss://#{loggregator_host}:4443/tail/?#{hash_to_query(query_params)}"
+      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})
@@ -31,6 +35,7 @@ module TailCfPlugin
 
         ws.on :error do |event|
           output.puts("Server error")
+          output.puts(event.data.inspect) if trace
         end
 
         ws.on :close do |event|
@@ -51,6 +56,16 @@ module TailCfPlugin
       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)
 
       return [] unless response.code == "200"
@@ -63,19 +78,39 @@ module TailCfPlugin
         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
     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("&"))
+      return URI.encode(hash.map { |k, v| "#{k}=#{v}" }.join("&"))
     end
 
-    attr_reader :output, :loggregator_host, :user_token
+    attr_reader :output, :loggregator_host, :user_token, :trace
   end
 end

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

@@ -30,7 +30,7 @@ module TailCfPlugin
         fail "Please provide an application to log."
       end
 
-      loggregator_client = LoggregatorClient.new(loggregator_host, client.token.auth_header, STDOUT)
+      loggregator_client = LoggregatorClient.new(loggregator_host, client.token.auth_header, STDOUT, input[:trace])
 
       if input[:recent]
         loggregator_client.dump_messages(log_target.query_params).each do |m|

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tail-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.21.pre
-  prerelease: 7
+  version: 0.0.22.pre
 platform: ruby
 authors:
 - Pivotal
@@ -14,7 +13,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -25,7 +23,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -36,7 +33,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -44,7 +40,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -52,7 +47,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -60,7 +54,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -82,27 +75,26 @@ files:
 homepage: http://github.com/cloudfoundry/tail-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: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CF Tail
 test_files: []