- fixa logic for setting debug level

- start working on our own Logger subclass so we can log objects if necessary

lib/logstash/agent.rb

@@ -4,6 +4,7 @@ require "logstash/namespace"
 require "logstash/inputs"
 require "logstash/outputs"
 require "logstash/filters"
+require "logstash/logging"
 
 # TODO(sissel): Make our own logger.
 require "logger"
@@ -11,11 +12,10 @@ require "logger"
 # Collect logs, ship them out.
 class LogStash::Agent
   attr_reader :config
+  include LogStash::Logging
 
   def initialize(config)
-    @logger = Logger.new(STDERR)
-    # $DEBUG is set when invoked with 'ruby -d'
-    @logger.level = $DEBUG ? Logger::WARN : Logger::DEBUG
+    init_logging
 
     @config = config
     @outputs = []

lib/logstash/inputs/file.rb

@@ -7,7 +7,7 @@ require "socket" # for Socket.gethostname
 class LogStash::Inputs::File
   def initialize(url, config={}, &block)
     @logger = Logger.new(STDERR)
-    @logger.level = $DEBUG ? Logger::WARN : Logger::DEBUG
+    @logger.level = $DEBUG ? Logger::DEBUG : Logger::WARN
 
     @url = url
     @url = URI.parse(url) if url.is_a? String

lib/logstash/logging.rb

@@ -0,0 +1,23 @@
+require "logstash/namespace"
+require "logger"
+
+class LogStash::Logger < Logger
+  def initialize(*args)
+    super(*args)
+    @@formatter ||= LogStash::Logger::Formatter.new
+    @formatter = @@formatter
+  end
+end
+
+class LogStash::Logger::Formatter #< Logger::Formatter
+  # [:call, "INFO", Wed Oct 27 01:48:46 -0700 2010, nil, {"hello"=>12345}]e
+  def call(level, timestamp, object)
+    # TODO(sissel): implement
+   end
+end
+
+#a =Logger.new(STDOUT)
+#a.formatter = LogStash::Logger::Formatter.new
+#a.level = Logger::INFO
+#a.info({"hello" => 12345})
+