trinidad 0.9.9 → 0.9.10

data/lib/trinidad.rb

@@ -22,5 +22,5 @@ require 'trinidad/rackup_web_app'
 
 
 module Trinidad
-  VERSION = '0.9.9'
+  VERSION = '0.9.10'
 end

data/lib/trinidad/command_line_parser.rb

@@ -115,6 +115,10 @@ module Trinidad
           default_options[:address] = v
         end
 
+        opts.on('-g', '--log LEVEL', 'Log level', 'default: INFO') do |v|
+          default_options[:log] = v
+        end
+
         opts.on('-v', '--version', 'display the current version') do
           puts "trinidad #{Trinidad::VERSION} (tomcat #{Trinidad::TOMCAT_VERSION})"
           exit

data/lib/trinidad/server.rb

@@ -1,6 +1,4 @@
 module Trinidad
-  JSystem = java.lang.System
-  JContext = javax.naming.Context
 
   class Server
     attr_reader :tomcat, :config
@@ -15,7 +13,8 @@ module Trinidad
         :port => 3000,
         :jruby_min_runtimes => 1,
         :jruby_max_runtimes => 5,
-        :address => 'localhost'
+        :address => 'localhost',
+        :log => 'INFO'
       }
     end
 
@@ -37,7 +36,7 @@ module Trinidad
       @tomcat.port = @config[:port].to_i
       @tomcat.base_dir = Dir.pwd
       @tomcat.host.app_base = Dir.pwd
-      enable_naming
+      @tomcat.enable_naming
 
       add_http_connector if http_configured?
       add_ssl_connector if ssl_enabled?
@@ -55,6 +54,7 @@ module Trinidad
         remove_defaults(app_context)
 
         web_app = WebApp.create(@config, app_config)
+        configure_logging(web_app)
 
         Trinidad::Extensions.configure_webapp_extensions(web_app.extensions, @tomcat, app_context)
         app_context.add_lifecycle_listener(WebAppLifecycleListener.new(web_app))
@@ -155,7 +155,8 @@ module Trinidad
       unless (config.has_key?(:web_apps))
         default_app = {
           :context_path => config[:context_path] || '/',
-          :web_app_dir => config[:web_app_dir] || Dir.pwd
+          :web_app_dir => config[:web_app_dir] || Dir.pwd,
+          :log => config[:log]
         }
         default_app[:rackup] = config[:rackup] if (config.has_key?(:rackup))
 
@@ -163,23 +164,6 @@ module Trinidad
       end
     end
 
-    def enable_naming
-      @tomcat.server.add_lifecycle_listener(Trinidad::Tomcat::NamingContextListener.new)
-
-      JSystem.set_property("catalina.useNaming", "true")
-
-      value = "org.apache.naming"
-      old_value = JSystem.get_property(JContext::URL_PKG_PREFIXES) || value
-
-      value = value + ":" + old_value unless old_value.include?(value)
-      JSystem.set_property(JContext::URL_PKG_PREFIXES, value)
-
-      value = JSystem.get_property(JContext::INITIAL_CONTEXT_FACTORY)
-      unless value
-        JSystem.set_property(JContext::INITIAL_CONTEXT_FACTORY, "org.apache.naming.java.javaURLContextFactory")
-      end
-    end
-
     def remove_defaults(app_context)
       default_servlet = app_context.find_child('default')
       app_context.remove_child(default_servlet) if default_servlet
@@ -193,5 +177,37 @@ module Trinidad
 
       app_context.process_tlds = false
     end
+
+    def configure_logging(web_app)
+      log_path = File.join(web_app.web_app_dir, 'log', "#{web_app.environment}.log")
+      log_file = java.io.File.new(log_path)
+
+      unless log_file.exists
+        log_file.parent_file.mkdirs
+        log_file.create_new_file
+      end
+
+      jlogging = java.util.logging
+
+      log_handler = jlogging.FileHandler.new(log_path, true)
+      logger = jlogging.Logger.get_logger("")
+
+      log_level = web_app.log
+      unless %w{ALL CONFIG FINE FINER FINEST INFO OFF SEVERE WARNING}.include?(log_level)
+        puts "Invalid log level #{log_level}, using default: INFO"
+        log_level = 'INFO'
+      end
+
+      level = jlogging.Level.parse(log_level)
+
+      logger.handlers.each do |handler|
+        handler.level = level
+      end
+
+      logger.level = level
+
+      log_handler.formatter = jlogging.SimpleFormatter.new
+      logger.add_handler(log_handler)
+    end
   end
 end

data/lib/trinidad/web_app.rb

@@ -48,7 +48,8 @@ module Trinidad
       @app_config[:public]  || @config[:public] || 'public'
     end
 
-    %w{web_app_dir libs_dir classes_dir default_web_xml environment jruby_min_runtimes jruby_max_runtimes rackup}.each do |method_name|
+    %w{web_app_dir libs_dir classes_dir default_web_xml environment 
+        jruby_min_runtimes jruby_max_runtimes rackup log}.each do |method_name|
       define_method method_name do
         sym = method_name.to_sym
         @app_config[sym] || @config[sym]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - David Calavera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 -04:00
+date: 2010-10-02 00:00:00 -04:00
 default_executable: trinidad
 dependencies: 
 - !ruby/object:Gem::Dependency