logs-cf-plugin 0.0.32.pre → 0.0.33.pre

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjU0YjAyM2U2ZmI3ODVlODhiYzI4NDA5YTJkNzE0OTNhZjc5NjUzYw==
+    MGZkN2I0YWQ1OThkOWQ3OGIxYzJkODBmZDE3MmIxMWRiNmU1NzZkZg==
   data.tar.gz: !binary |-
-    NWIyZjZlZGJmYTZhMWJmNzU5ODNhZjRlNzdkMGIwZWMwMmUxMGYwNA==
+    NTBhODJmZjkwZjc2NWUxZDM0MWY4NGE0ZjE0Yjg4NzQzZWQyYzBkMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjIwZmIwZmZmMzQwNmRlOTlmMzI1MmQzNjUyYmUxNjc4YjYyNzYzN2Y4OWJk
-    ZjNmNDcyNWY5Yjc2NzM1Nzg3ODAxYWFkNzkxMzVjYmE0YWIxMTE5OWE3NDVi
-    OTQ3ZGIzODRlZTIwYjEzNWFkYjllZmJmNDFiZWU1YzAxMjU4ZDY=
+    MThkMjRiMTViMmIzZWUyMDUxMDllOWVlYzIxN2I1NWFiZDFiYWI0MDhmM2Ni
+    NzI3YjZiNTZlMTYyZWI1YzQ2MmE0ODU0ZWI5MDllODFjZjY1ZDViY2FjOGYy
+    ODE4N2FhYzk5OGYxZWY1NTAxY2E0NjY4ODM5ZWQwOWFiZjM4ZjU=
   data.tar.gz: !binary |-
-    OGExNjAwZDMwYzJiNzg1YTRiOGE1OWNiYWE2NjhjZjVmZTVkODVkNmMxN2Ix
-    MzgzZjUxZTA5MGVmNTU4OTMwNmU5MTk4ZTFmZGNmMDQ0OTZlYmFjYTlmZTQ5
-    YWNjNTRiYjRkNTFlMjQzYTdhZjI2MTdiMzFmMTU1OTc1ZjlkY2U=
+    ZmU0NjZhMjlmOTkwY2Q2OGMwZGNkNDhiZDJlNjJjOWI4NDQ3ZGYzOTc3ZDll
+    MTQ3ZTllN2Q3NzhjNjk5Zjk0YmNmZmFjNmI5MDFiODRhNDJjMjI4NjZlNTNk
+    NDc3MWE2YmExOTgwZGM1YzA0YWVkNjEyYTRkZGU2MDQ2MDk4ZTc=

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

@@ -3,15 +3,21 @@ module LogsCfPlugin
     include CFoundry::TraceHelpers
     include MessageWriter
 
-    def initialize(loggregator_host, user_token, output, trace)
+    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(query_params)
-      websocket_address = "wss://#{loggregator_host}:4443/tail/?#{hash_to_query(query_params)}"
+      if use_ssl
+        websocket_address = "wss://#{loggregator_host}:4443/tail/?#{hash_to_query(query_params)}"
+      else
+        websocket_address = "ws://#{loggregator_host}/tail/?#{hash_to_query(query_params)}"
+      end
+
       output.puts "websocket_address: #{websocket_address}" if trace
 
       EM.run {
@@ -58,9 +64,10 @@ module LogsCfPlugin
     end
 
     def dump_messages(query_params)
-      uri = URI.parse("https://#{loggregator_host}/dump/?#{hash_to_query(query_params)}")
+      prefix = use_ssl ? 'https' : 'http'
+      uri = URI.parse("#{prefix}://#{loggregator_host}/dump/?#{hash_to_query(query_params)}")
       http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
+      http.use_ssl = use_ssl
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
       request = Net::HTTP::Get.new(uri.request_uri)
@@ -126,6 +133,6 @@ module LogsCfPlugin
       return URI.encode(hash.map { |k, v| "#{k}=#{v}" }.join("&"))
     end
 
-    attr_reader :output, :loggregator_host, :user_token, :trace
+    attr_reader :output, :loggregator_host, :user_token, :trace, :use_ssl
   end
 end

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

@@ -29,7 +29,7 @@ module LogsCfPlugin
         fail "Please provide an application to log."
       end
 
-      loggregator_client = LoggregatorClient.new(loggregator_host, client.token.auth_header, STDOUT, input[:trace])
+      loggregator_client = LoggregatorClient.new(loggregator_host, client.token.auth_header, STDOUT, input[:trace], use_ssl)
 
       if input[:recent]
         loggregator_client.dump_messages(log_target.query_params)
@@ -46,5 +46,9 @@ module LogsCfPlugin
       target_base = client.target.sub(/^https?:\/\/([^\.]+\.)?(.+)\/?/, '\2')
       "loggregator.#{target_base}"
     end
+
+    def use_ssl
+      client.target.start_with?('https')
+    end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logs-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.32.pre
+  version: 0.0.33.pre
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf