logstash-lite 0.2.20101124004656 → 0.2.20101124030048

data/lib/logstash/agent.rb

@@ -1,10 +1,10 @@
 require "eventmachine"
 require "eventmachine-tail"
-require "logstash/namespace"
-require "logstash/inputs"
-require "logstash/outputs"
 require "logstash/filters"
+require "logstash/inputs"
 require "logstash/logging"
+require "logstash/namespace"
+require "logstash/outputs"
 
 # Collect logs, ship them out.
 class LogStash::Agent
@@ -80,6 +80,9 @@ class LogStash::Agent
         @outputs << output
       end # each output
     end
+
+    # Register any signal handlers
+    sighandler
   end # def register
 
   public
@@ -124,4 +127,33 @@ class LogStash::Agent
       output(event)
     end
   end # def input
+
+  public
+  def sighandler
+    @sigchannel = EventMachine::Channel.new
+    Signal.trap("USR1") do
+      @sigchannel.push(:USR1)
+    end
+
+    @sigchannel.subscribe do |msg|
+      case msg
+      when :USR1
+        counts = Hash.new { |h,k| h[k] = 0 }
+        ObjectSpace.each_object do |obj|
+          counts[obj.class] += 1
+        end
+
+        @logger.info("SIGUSR1 received. Dumping state")
+        @logger.info("#{self.class.name} config")
+        @logger.info(["  Inputs:", @inputs])
+        @logger.info(["  Filters:", @filters])
+        @logger.info(["  Outputs:", @outputs])
+
+        @logger.info("Dumping counts of objects by class")
+        counts.sort { |a,b| a[1] <=> b[1] or a[0] <=> b[0] }.each do |key, value|
+          @logger.info("Class: [#{value}] #{key}")
+        end
+      end
+    end
+  end
 end # class LogStash::Components::Agent

data/lib/logstash/event.rb

@@ -4,7 +4,7 @@ require "uri"
 
 # General event type. Will expand this in the future.
 module LogStash; class Event
-  def initialize(data)
+  def initialize(data=Hash.new)
     @cancelled = false
     @data = {
       "@source" => "unknown",

data/lib/logstash/filters/base.rb

@@ -14,4 +14,12 @@ class LogStash::Filters::Base
   def filter(event)
     raise "#{self.class}#filter must be overidden"
   end # def filter
+
+  def add_config(type, typeconfig)
+    if @config.include?(type)
+      @config[type].merge!(typeconfig)
+    else
+      @config[type] = typeconfig
+    end
+  end
 end # class LogStash::Filters::Base

data/lib/logstash/filters/multiline.rb

@@ -93,7 +93,7 @@ class LogStash::Filters::Multiline < LogStash::Filters::Base
     key = [event.source, event.type]
     pending = @pending[key]
 
-    @logger.info(["Reg: ", typeconfig["pattern"], event.message, match])
+    @logger.debug(["Reg: ", typeconfig["pattern"], event.message, match])
     case typeconfig["what"]
     when "previous"
       if match

data/lib/logstash/time.rb

@@ -20,7 +20,9 @@ class LogStash::Time < ::Time
   def self.to_iso8601(obj)
     if obj.is_a?(DateTime)
       tz = obj.offset == 0 ? "Z" : obj.strftime("%z")
-      return "%s.%06d%s" % [obj.strftime(ISO8601), obj.sec_fraction.to_f, tz]
+      # DateTime#sec_fraction is fractional seconds "of a day"
+      sec_fraction = (obj.sec_fraction.to_f * 86400 * 1000000)
+      return "%s.%06d%s" % [obj.strftime(ISO8601), sec_fraction, tz]
     else
       raise "Can't convert object of type #{obj.class} (#{obj}) to iso8601."
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logstash-lite
 version: !ruby/object:Gem::Version 
-  hash: 40202248009335
+  hash: 40202248060119
   prerelease: false
   segments: 
   - 0
   - 2
-  - 20101124004656
-  version: 0.2.20101124004656
+  - 20101124030048
+  version: 0.2.20101124030048
 platform: ruby
 authors: 
 - Jordan Sissel