trinidad_daemon_extension 0.1.0 → 0.1.2

data/History.txt

@@ -1,3 +1,7 @@
+0.1.2 (2010-04-19)
+
+* logging enabled
+
 0.1.0 (2010-04-17)
  
-  * First release
+* First release

data/README

@@ -18,12 +18,12 @@ It uses a temporal directory to write the pid file but its route can be override
 
   * To enable it from the configuration file you have to add a section "extensions" to the root of the file and the section "daemon" to this one. The pid file can be specified there:
 
-    --
+    ---
       extensions:
         daemon:
           pid_file: ./trinidad.pid # this is optional by default the extension writes the pid file into a temporal directory.
 
-  * To enable it from the command line you have to load the extension first and the add one of these options:
+  * To enable it from the command line you have to load the extension first and then add one of these options:
 
      -d, --daemonize [PID_FILE]
 
@@ -31,11 +31,17 @@ It uses a temporal directory to write the pid file but its route can be override
 
      $ jruby -S trinidad --load daemon --daemonize ./trinidad.pid
 
-# TODO
+The log file where the daemon writes its logs is also configurable from the trinidad's configuration file.
+By default it writes the logs into the file log/trinidad.log with the level INFO, to modify this behaviour you just need to add these lines under the daemon configuration:
 
-  * enable logging. Right now the Tomcat's log is not written anywhere.
+    ---
+      extensions:
+        daemon:
+          log:
+            file: trinidad.log # where the daemon writes its output
+            level: ALL # severity level, it cn be one of these: ALL, CONFIG, FINE, FINER, FINEST, INFO, OFF, SEVERE, WARNING 
 
-You can find further information on how to write your onw extension in the wiki: http://wiki.github.com/calavera/trinidad/extensions
+You can find further information on how to write your own extension in the wiki: http://wiki.github.com/calavera/trinidad/extensions
 
 # Copyright
 

data/lib/trinidad_daemon_extension.rb

@@ -9,15 +9,29 @@ require File.expand_path('../../trinidad-libs/trinidad-daemon-extension', __FILE
 module Trinidad
   module Extensions
     module Daemon
-      VERSION = '0.1.0'
+      VERSION = '0.1.2'
     end
 
     class DaemonServerExtension < ServerExtension
       def configure(tomcat)
-        org.jruby.trinidad.TrinidadDaemon.new(tomcat, @options[:pid_file])
+        org.jruby.trinidad.TrinidadDaemon.new(tomcat, @options[:pid_file], logger_options)
       end
 
       def override_tomcat?; true; end
+
+      def logger_options
+        log = @options[:log] || {}
+        log[:file] ||= 'log/trinidad.log'
+
+        level = log[:level] || 'INFO'
+        unless %w{ALL CONFIG FINE FINER FINEST INFO OFF SEVERE WARNING}.include?(level)
+          puts "Invalid log level #{level}, using default: INFO"
+        end
+        log[:level] = level
+        log = Hash[log.map{|k, v| [k.to_s, v]}]
+
+        Java::java.util.HashMap.new(log)
+      end
     end
 
     class DaemonOptionsExtension < OptionsExtension

data/rakelib/build.rake

@@ -18,7 +18,7 @@ namespace :ant do
     opts = {
       :fork => 'true',
       :failonerror => 'true',
-      :srcdir => 'src/main',
+      :srcdir => 'src/main/java',
       :destdir => TARGET_DIR,
       :classpath => Dir.glob('trinidad-libs/*.jar').join(':')
     }

data/spec/trinidad_daemon_extension_spec.rb

@@ -25,12 +25,44 @@ describe Trinidad::Extensions::DaemonServerExtension do
     daemon.pid_file.should =~ /trinidad_pid.txt$/
   end
 
+  it "creates a default log info when it's not present" do
+    log = subject.logger_options
+    log['file'].should == 'log/trinidad.log'
+    log['level'].should == 'INFO'
+  end
+
+  it "uses the log configuration provided when it's present" do
+    extension = Trinidad::Extensions::DaemonServerExtension.new({
+      :log => {
+        :file => 'custom.log',
+        :level => 'ALL'
+      }
+    })
+
+    log = extension.logger_options
+    log['file'].should == 'custom.log'
+    log['level'].should == 'ALL'
+  end
+
+  it "uses the default level when it's not recognized" do
+    extension = Trinidad::Extensions::DaemonServerExtension.new({
+      :log => {
+        :level => 'LEVEL'
+      }
+    })
+
+    log = extension.logger_options
+    log['file'].should == 'log/trinidad.log'
+    log['level'].should == 'LEVEL'
+  end
+end
+
+describe Trinidad::Extensions::DaemonOptionsExtension do
   it "allows to specify a command line option to run the daemon" do
-    extension = Trinidad::Extensions::DaemonOptionsExtension.new
     parser = OptionParser.new
     options = {}
-    
-    extension.configure(parser, options)
+
+    subject.configure(parser, options)
     parser.parse! '-d /tmp/trinidad.pid'.split
 
     options[:extensions].keys.should include(:daemon)

data/trinidad_daemon_extension.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'trinidad_daemon_extension'
-  s.version           = '0.1.0'
-  s.date              = '2010-04-17'
+  s.version           = '0.1.2'
+  s.date              = '2010-04-19'
   s.rubyforge_project = 'trinidad_daemon_extension'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - David Calavera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 +02:00
+date: 2010-04-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency