logstash-lite 0.2.20101208111718 → 0.2.20101222161646

data/bin/logstash

@@ -8,11 +8,12 @@ require "logstash/agent"
 require "optparse"
 require "yaml"
 
-Settings = Struct.new(:config_file, :daemonize, :logfile)
+Settings = Struct.new(:config_file, :daemonize, :logfile, :verbose)
 
 settings = Settings.new
 settings.daemonize = false
 settings.config_file = nil
+settings.verbose = 0
 progname = File.basename($0)
 
 opts = OptionParser.new do |opts|
@@ -30,6 +31,10 @@ opts = OptionParser.new do |opts|
   opts.on("-l", "--log FILE", "Log to a given path. Default is stdout.") do |path|
     settings.logfile = path
   end
+
+  opts.on("-v", "Increase verbosity (not yet used)") do
+    settings.verbose += 1
+  end
 end
 
 begin
@@ -62,6 +67,7 @@ if settings.daemonize
     exit(0)
   end
 end
+
 agent = LogStash::Agent.new(config)
 if settings.logfile
   agent.log_to(settings.logfile)

data/etc/init/logstash

@@ -0,0 +1,68 @@
+#! /bin/sh
+#
+# Logstash Start/Stop logstash
+#
+# chkconfig: 345 99 99
+# description: Logstash
+# processname: logstash
+
+logstash_bin="/usr/bin/logstash"
+logstash_conf="/etc/logstash/logstash.yaml"
+logstash_log="/var/log/logstash/logstash.log"
+NICE_LEVEL="-n 19"
+
+find_logstash_process () {
+    PIDTEMP=`ps ux | grep ruby | grep logstash | awk '{ print $2 }'`
+    # Pid not found
+    if [ "x$PIDTEMP" = "x" ]; then
+        PID=-1
+    else
+        PID=$PIDTEMP
+    fi
+}
+
+start () {
+    LOG_DIR=`dirname ${logstash_log}`
+    if [ ! -d $LOG_DIR ]; then
+      echo "Log dir ${LOG_DIR} doesn't exist. Creating"
+      mkdir $LOG_DIR
+    fi
+    nice ${NICE_LEVEL} ${logstash_bin} -d -f ${logstash_conf} -l ${logstash_log}
+}
+
+stop () {
+    find_logstash_process
+    if [ $PID -ne -1 ]; then
+        kill $PID
+    fi
+}
+
+case $1 in
+start)
+        start
+        ;;
+stop)
+        stop
+        exit 0
+        ;;
+reload)
+        stop
+        start
+        ;;
+restart)
+        stop
+        start
+        ;;
+status)
+        find_logstash_process
+	if [ $PID -gt 0 ]; then
+            exit 0
+        else
+            exit 1
+	fi 
+        ;;
+*)
+        echo $"Usage: $0 {start|stop|restart|reload|status}"
+        RETVAL=1
+esac
+exit 0

data/lib/logstash/filters/grok.rb

@@ -38,10 +38,9 @@ class LogStash::Filters::Grok < LogStash::Filters::Base
         pile = @grokpiles[event.type]
         grok, match = pile.match(message)
       end # @grokpiles.include?(event.type)
-      # TODO(2.0): support grok pattern discovery
-    else
+     else
+      return
       @logger.info("Unknown type for #{event.source} (type: #{event.type})")
-      @logger.debug(event.to_hash)
     end
 
     if match

data/lib/logstash/web/server.rb

@@ -99,9 +99,42 @@ class LogStash::Web::Server < Sinatra::Base
       body haml :"search/ajax", :layout => !request.xhr?
     end # elasticsearch.search
   end # apost '/search/ajax'
-
 end # class LogStashWeb
 
+require "optparse"
+
+Settings = Struct.new(:daemonize, :logfile)
+settings = Settings.new
+progname = File.basename($0)
+
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: #{progname} [options]"
+
+  opts.on("-d", "--daemonize", "Daemonize (default is run in foreground)") do 
+    settings.daemonize = true
+  end
+
+  opts.on("-l", "--log FILE", "Log to a given path. Default is stdout.") do |path|
+    settings.logfile = path
+  end
+end
+
+opts.parse!
+
+if settings.daemonize
+  if Process.fork == nil
+    Process.setsid 
+  else
+    exit(0)
+  end
+end
+
+if settings.logfile
+  logfile = File.open(settings.logfile, "w")
+  STDOUT.reopen(logfile)
+  STDERR.reopen(logfile)
+end
+
 Rack::Handler::Thin.run(
   Rack::CommonLogger.new( \
     Rack::ShowExceptions.new( \

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logstash-lite
 version: !ruby/object:Gem::Version 
-  hash: 40202416223451
+  hash: 40202444323275
   prerelease: false
   segments: 
   - 0
   - 2
-  - 20101208111718
-  version: 0.2.20101208111718
+  - 20101222161646
+  version: 0.2.20101222161646
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -08:00
+date: 2010-12-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -217,6 +217,7 @@ files:
 - examples/sample-agent-in-ruby.rb
 - etc/tograylog.yaml
 - etc/logstash-elasticsearch-rabbitmq-river.yaml
+- etc/init/logstash
 - etc/logstash-nagios.yaml
 - etc/logstash-reader.yaml
 - etc/logstash-stomp-input.yaml