trinidad 1.2.1 → 1.2.2

data/History.txt

@@ -1,3 +1,9 @@
+== Trinidad 1.2.2 (2011-07-12)
+
+* Better log formatter
+* Allow to use an ERB template as configuration file
+* Fix trinidad_init_services compatibility issues
+
 == Trinidad 1.2.1 (2011-06-15)
 
 * Allow to specify the monitor file from the command line

data/lib/trinidad.rb

@@ -11,6 +11,7 @@ require 'trinidad/extensions'
 require 'trinidad/command_line_parser'
 require 'trinidad/jars'
 require 'trinidad/server'
+require 'trinidad/log_formatter'
 require 'trinidad/lifecycle/takeover'
 require 'trinidad/lifecycle/lifecycle_listener_host'
 require 'trinidad/lifecycle/lifecycle_listener_base'
@@ -22,5 +23,5 @@ require 'trinidad/rackup_web_app'
 require 'trinidad/war_web_app'
 
 module Trinidad
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/lib/trinidad/command_line_parser.rb

@@ -31,10 +31,11 @@ module Trinidad
 
       if default_options.has_key?(:config)
         require 'yaml'
+        require 'erb'
         default_options[:config] = File.expand_path(default_options[:config], default_options[:web_app_dir] || Dir.pwd)
 
         if File.exist?(default_options[:config])
-          config_options = YAML.load_file(default_options[:config])
+          config_options = YAML.load(ERB.new(File.read(default_options[:config])).result(binding))
           default_options.deep_merge!(config_options.symbolize!)
         end
       end

data/lib/trinidad/lifecycle/lifecycle_listener_base.rb

@@ -60,15 +60,15 @@ module Trinidad
 
         level = jlogging.Level.parse(log_level)
 
+        logger.add_handler(log_handler)
+
         logger.handlers.each do |handler|
           handler.level = level
+          handler.formatter = Trinidad::LogFormatter.new
         end
 
         logger.level = level
 
-        log_handler.formatter = jlogging.SimpleFormatter.new
-        logger.add_handler(log_handler)
-
         @configured_logger = true
       end
     end

data/lib/trinidad/log_formatter.rb

@@ -0,0 +1,15 @@
+module Trinidad
+  class LogFormatter < Java::JavaUtilLogging::Formatter
+    def initialize format = "yyyy-MM-dd HH:mm:ss"
+      @format = Java::JavaText::SimpleDateFormat.new format
+    end
+
+    def format(record)
+      timestamp = @format.format(Java::JavaUtil::Date.new record.millis)
+      level = record.level.name
+      message = record.message.chomp
+
+      "#{timestamp} #{level}: #{message}\n"
+    end
+  end
+end

data/lib/trinidad/server.rb

@@ -14,7 +14,8 @@ module Trinidad
         :jruby_min_runtimes => 1,
         :jruby_max_runtimes => 5,
         :address => 'localhost',
-        :log => 'INFO'
+        :log => 'INFO',
+        :trap => true
       }
     end
 
@@ -190,12 +191,17 @@ module Trinidad
     end
 
     def start
-      trap_signals(@tomcat)
+      trap_signals if @config[:trap]
 
       @tomcat.start
       @tomcat.server.await
     end
 
+    def stop
+      @tomcat.stop
+      @tomcat.destroy
+    end
+
     private
 
     def add_default_web_app!(config)
@@ -211,9 +217,9 @@ module Trinidad
       end
     end
 
-    def trap_signals(tomcat)
-      trap('INT') { tomcat.stop }
-      trap('TERM') { tomcat.stop }
+    def trap_signals
+      trap('INT') { stop }
+      trap('TERM') { stop }
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: trinidad
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
   - David Calavera
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 +02:00
+date: 2011-07-12 00:00:00 +02:00
 default_executable: trinidad
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
   - lib/trinidad/command_line_parser.rb
   - lib/trinidad/core_ext.rb
   - lib/trinidad/extensions.rb
+  - lib/trinidad/log_formatter.rb
   - lib/trinidad/rackup_web_app.rb
   - lib/trinidad/rails_web_app.rb
   - lib/trinidad/server.rb