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

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

@@ -0,0 +1,46 @@
+module TailCfPlugin
+  class LogTarget
+    def initialize(target_organization, target_space, ids)
+      raise ArgumentError, "Requires 3 ids" unless ids.size == 3
+      @target_organization = target_organization
+      @target_space = target_space
+
+      @org_id = ids[0]
+      @space_id = ids[1]
+      @app_id = ids[2]
+    end
+
+    def ambiguous?
+      @target_organization && @target_space
+    end
+
+    def valid?
+      !!target
+    end
+
+    def query_params
+      case target
+        when :org
+          {org: @org_id}
+        when :space
+          {org: @org_id, space: @space_id}
+        when :app
+          {org: @org_id, space: @space_id, app: @app_id}
+      end
+    end
+
+    private
+
+    def target
+      return nil if ambiguous?
+      case
+        when @target_organization
+          :org
+        when @target_space
+          :space
+        when @app_id
+          :app
+      end
+    end
+  end
+end

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

@@ -1,16 +1,18 @@
 require 'log_message/log_message.pb'
 require 'faye/websocket'
 require 'eventmachine'
+require 'uri'
 
 module TailCfPlugin
   class LoggregatorClient
-    def initialize(output)
+    def initialize(loggregator_host, user_token, output)
       @output = output
+      @loggregator_host = loggregator_host
+      @user_token = user_token
     end
 
-    def listen(loggregator_host, space_id, app_id, user_token)
-      websocket_address = "wss://#{loggregator_host}:4443/tail/spaces/#{space_id}"
-      websocket_address += "/apps/#{app_id}" if app_id
+    def listen(query_params)
+      websocket_address = "wss://#{loggregator_host}:4443/tail/?#{hash_to_query(query_params)}"
 
       EM.run {
         ws = Faye::WebSocket::Client.new(websocket_address, nil, :headers => {"Origin" => "http://localhost", "Authorization" => user_token})
@@ -24,7 +26,7 @@ module TailCfPlugin
 
         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(" "))
+          MessageWriter.write(output, received_message)
         end
 
         ws.on :error do |event|
@@ -40,12 +42,40 @@ module TailCfPlugin
       }
     end
 
+    def dump_messages(query_params)
+      uri = URI.parse("https://#{loggregator_host}/dump/?#{hash_to_query(query_params)}")
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      request = Net::HTTP::Get.new(uri.request_uri)
+      request['Authorization'] = user_token
+
+      response = http.request(request)
+
+      return [] unless response.code == "200"
+
+      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
+      messages
+    end
+
     private
 
     def keep_alive_interval
       25
     end
 
-    attr_reader :output
+    def hash_to_query(hash)
+      return URI.encode(hash.map{|k,v| "#{k}=#{v}"}.join("&"))
+    end
+
+    attr_reader :output, :loggregator_host, :user_token
   end
 end

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

@@ -0,0 +1,5 @@
+module MessageWriter
+  def self.write(output, message)
+    output.puts([message.app_id, message.source_id, message.message_type_name, message.message].join(" "))
+  end
+end

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

@@ -2,28 +2,44 @@ require 'cf'
 
 module TailCfPlugin
   require 'tail-cf-plugin/loggregator_client'
+  require 'tail-cf-plugin/log_target'
+  require 'tail-cf-plugin/message_writer'
 
   class Plugin < CF::CLI
     include LoginRequirements
 
-    desc "Tail logs for CF applications or spaces"
+    desc "Tail or dump logs for CF applications or spaces"
     group :apps
     input :app, :desc => "App to tail logs from", :argument => :optional, :from_given => by_name(:app)
     input :space, :type => :boolean, :desc => "Logs of all apps in the current space", :default => false
+    input :org, :type => :boolean, :desc => "Logs of all apps and spaces in the current organization", :default => false
+    input :recent, :type => :boolean, :desc => "Dump recent logs instead of tailing", :default => false
 
     def logs
-      if input[:space]
-        app_guid = nil
-      else
-        unless input[:app]
-          Mothership::Help.command_help(@@commands[:logs])
-          fail "Please provide an application to log or call with --space"
-        end
-        app_guid = input[:app].guid
+      guids = [client.current_organization.guid, client.current_space.guid, input[:app].try(:guid)]
+
+      log_target = LogTarget.new(input[:org], input[:space], guids)
+
+      if log_target.ambiguous?
+        Mothership::Help.command_help(@@commands[:logs])
+        fail "Please provide either --space or --org, but not both."
+      end
+
+      unless log_target.valid?
+        Mothership::Help.command_help(@@commands[:logs])
+        fail "Please provide an application to log."
       end
 
-      loggregator_client = LoggregatorClient.new(STDOUT)
-      loggregator_client.listen(loggregator_host, client.current_space.guid, app_guid, client.token.auth_header)
+      loggregator_client = LoggregatorClient.new(loggregator_host, client.token.auth_header, STDOUT)
+
+      if input[:recent]
+        loggregator_client.dump_messages(log_target.query_params).each do |m|
+          MessageWriter.write(STDOUT, m)
+        end
+
+      else
+        loggregator_client.listen(log_target.query_params)
+      end
     end
 
     ::ManifestsPlugin.default_to_app_from_manifest(:logs, false)
@@ -34,6 +50,5 @@ module TailCfPlugin
       target_base = client.target.sub(/^https?:\/\/([^\.]+\.)?(.+)\/?/, '\2')
       "loggregator.#{target_base}"
     end
-
   end
 end

data/vendor/log_message/log_message.pb.rb

@@ -23,6 +23,8 @@ class LogMessage
   required :app_id, :string, 4
   required :source_type, LogMessage::SourceType, 5
   optional :source_id, :string, 6
+  optional :space_id, :string, 7
+  required :organization_id, :string, 8
 
   def message_type_name
     {MessageType::OUT => 'STDOUT', MessageType::ERR => 'STDERR'}[message_type]

data/vendor/log_message/log_message.proto

@@ -20,4 +20,6 @@ message LogMessage {
     required string app_id = 4;
     required SourceType source_type = 5;
     optional string source_id = 6;
+    optional string space_id = 7;
+    required string organization_id = 8;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tail-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.20.pre
+  version: 0.0.21.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf
@@ -72,7 +72,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/tail-cf-plugin/log_target.rb
 - lib/tail-cf-plugin/loggregator_client.rb
+- lib/tail-cf-plugin/message_writer.rb
 - lib/tail-cf-plugin/plugin.rb
 - vendor/log_message/log_message.pb.rb
 - vendor/log_message/log_message.proto