tail-cf-plugin 0.0.14.pre → 0.0.15.pre

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

@@ -1,32 +1,32 @@
-require 'celluloid/websocket/client'
-
 module TailCfPlugin
   class LoggregatorClient
-    include Celluloid
-
     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 = "wss://#{loggregator_host}/tail/spaces/#{space_id}"
       websocket_address += "/apps/#{app_id}" if app_id
+
       websocket_address += "?authorization=#{URI.encode(user_token)}"
 
-      @client = Celluloid::WebSocket::Client.new(websocket_address, current_actor, headers: {"Origin" => "http://localhost" })
-    end
+      EM.run {
+        ws = Faye::WebSocket::Client.new(websocket_address, nil, :headers => {"Origin" => "http://localhost"})
 
-    def on_open
-      output.puts("Connected to server.")
-    end
+        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
 
-    def on_message(data)
-      received_message = LogMessage.decode(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
 
-    def on_close(code, reason)
-      output.puts("Server dropped connection...goodbye. #{code} #{reason}")
+        ws.on :close do |event|
+          output.puts("Server dropped connection...goodbye.")
+          EM.stop
+        end
+      }
     end
 
     private

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

@@ -1,4 +1,6 @@
 require 'cf'
+require 'faye/websocket'
+require 'eventmachine'
 
 module TailCfPlugin
   require 'tail-cf-plugin/loggregator_client'
@@ -25,7 +27,6 @@ module TailCfPlugin
 
       loggregator_client = LoggregatorClient.new(STDOUT)
       loggregator_client.listen(loggregator_host, client.current_space.guid, app_guid, client.token.auth_header)
-      wait_for_ws_connection_close
     end
 
     ::ManifestsPlugin.default_to_app_from_manifest(:tail, false)
@@ -37,9 +38,5 @@ module TailCfPlugin
       "loggregator.#{target_base}"
     end
 
-    def wait_for_ws_connection_close
-      sleep
-    end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tail-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.14.pre
+  version: 0.0.15.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -34,13 +34,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: beefcake
+  name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,15 +48,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: celluloid-websocket-client
+  name: beefcake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -64,71 +64,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: faye-websocket
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.7
 description: CF command line tool to tail CF Application Logs
 email:
 - vcap-dev@googlegroups.com