logstash-lite 0.2.20110112115019 → 0.2.20110122143801

data/etc/foo.yaml

@@ -0,0 +1,6 @@
+--- 
+inputs:
+  all:
+  - syslog://0.0.0.0:5544/
+outputs:
+- stdout:///

data/lib/logstash/filters/grep.rb

@@ -80,7 +80,7 @@ class LogStash::Filters::Grep < LogStash::Filters::Base
         if event[field].empty? and match["negate"] == true
           match_count += 1
         end
-        event[field].each do |value|
+        (event[field].is_a?(Array) ? event[field] : [event[field]]).each do |value|
           if match["negate"] == true
             @logger.debug("want negate match")
             next if re.match(value)

data/lib/logstash/inputs/amqp.rb

@@ -27,7 +27,13 @@ class LogStash::Inputs::Amqp < LogStash::Inputs::Base
   public
   def register
     @logger.info("Registering input #{@url}")
-    @amqp = AMQP.connect(:host => @url.host)
+    amqpsettings = {
+      :host => @url.host,
+      :port => (@url.port or 5672),
+    }
+    amqpsettings[:user] = @url.user if @url.user
+    amqpsettings[:pass] = @url.password if @url.password
+    @amqp = AMQP.connect(amqpsettings)
     @mq = MQ.new(@amqp)
     @target = nil
 

data/lib/logstash/outputs/amqp.rb

@@ -24,7 +24,13 @@ class LogStash::Outputs::Amqp < LogStash::Outputs::Base
   public
   def register
     @logger.info("Registering output #{@url}")
-    @amqp = AMQP.connect(:host => @url.host, :port => (@url.port or 5672))
+    amqpsettings = {
+      :host => @url.host,
+      :port => (@url.port or 5672),
+    }
+    amqpsettings[:user] = @url.user if @url.user
+    amqpsettings[:pass] = @url.password if @url.password
+    @amqp = AMQP.connect(amqpsettings)
     @mq = MQ.new(@amqp)
     @target = nil
 

data/lib/logstash/outputs/elasticsearch.rb

@@ -62,7 +62,8 @@ class LogStash::Outputs::Elasticsearch < LogStash::Outputs::Base
       @callback = self.method(:receive_http)
     when "river"
       params["port"] ||= 5672
-      mq_url = URI::parse("amqp://#{params["host"]}:#{params["port"]}/queue/#{params["queue"]}?durable=1")
+      auth = "#{params["user"] or "guest"}:#{params["pass"] or "guest"}"
+      mq_url = URI::parse("amqp://#{auth}@#{params["host"]}:#{params["port"]}/queue/#{params["queue"]}?durable=1")
       @mq = LogStash::Outputs::Amqp.new(mq_url.to_s)
       @mq.register
       @callback = self.method(:receive_river)

data/lib/logstash/ruby_fixes.rb

@@ -8,3 +8,5 @@ if !String.instance_methods.include?("start_with?")
     end
   end
 end
+
+require "logstash/rubyfixes/regexp_union_takes_array"

data/lib/logstash/rubyfixes/regexp_union_takes_array.rb

@@ -0,0 +1,27 @@
+# Check if Regexp.union takes an array. If not, monkeypatch it.
+# This feature was added in Ruby 1.8.7 and is required by 
+# Rack 1.2.1, breaking ruby <= 1.8.6
+
+needs_fix = false
+begin
+  Regexp.union(["a", "b"])
+rescue TypeError => e
+  if e.message == "can't convert Array into String"
+    needs_fix = true
+  end
+end
+
+if needs_fix
+  class Regexp
+    class << self
+      alias_method :orig_regexp_union, :union
+      public
+      def union(*args)
+        if args[0].is_a?(Array) && args.size == 1
+          return orig_regexp_union(*args[0])
+        end
+        return orig_regexp_union(*args)
+      end # def union
+    end # class << self 
+  end # class Regexp
+end # if needs_fix

data/lib/logstash/web/server.rb

@@ -63,7 +63,8 @@ class LogStash::Web::Server < Sinatra::Base
     # have javascript enabled, we need to show the results in
     # case a user doesn't have javascript.
     if params[:q] and params[:q] != ""
-      elasticsearch.search(params) do |@results|
+      elasticsearch.search(params) do |results|
+        @results = results
         @hits = (@results["hits"]["hits"] rescue [])
         begin
           result_callback.call
@@ -82,8 +83,8 @@ class LogStash::Web::Server < Sinatra::Base
     headers({"Content-Type" => "text/html" })
     count = params["count"] = (params["count"] or 50).to_i
     offset = params["offset"] = (params["offset"] or 0).to_i
-    elasticsearch.search(params) do |@results|
-      #p instance_variables
+    elasticsearch.search(params) do |results|
+      @results = results
       if @results.include?("error")
         body haml :"search/error", :layout => !request.xhr?
         next

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logstash-lite
 version: !ruby/object:Gem::Version 
-  hash: 40220224230017
-  prerelease: false
+  hash: 40220244287589
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 20110112115019
-  version: 0.2.20110112115019
+  - 20110122143801
+  version: 0.2.20110122143801
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -08:00
+date: 2011-01-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,6 +115,7 @@ files:
 - lib/logstash/outputs/beanstalk.rb
 - lib/logstash/outputs/tcp.rb
 - lib/logstash/namespace.rb
+- lib/logstash/rubyfixes/regexp_union_takes_array.rb
 - lib/logstash/time.rb
 - lib/logstash/filters.rb
 - lib/logstash/outputs.rb
@@ -220,6 +221,7 @@ files:
 - examples/sample-agent-in-ruby.rb
 - etc/tograylog.yaml
 - etc/logstash-elasticsearch-rabbitmq-river.yaml
+- etc/foo.yaml
 - etc/init/logstash
 - etc/logstash-nagios.yaml
 - etc/logstash-reader.yaml
@@ -277,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: logstash - log and event management (lite install, no dependencies)