trinidad_daemon_extension 0.2.6 → 0.2.7

data/History.txt

@@ -1,3 +1,7 @@
+== 0.2.7 (2011-03-19)
+
+* Fix delegation issue to get the host
+
 == 0.2.6 (2011-02-22)
 
 * Fix issue overriding JVM arguments

data/README

@@ -31,23 +31,6 @@ It uses a temporal directory to write the pid file but its route can be override
 
      $ jruby -S trinidad --load daemon --daemonize ./trinidad.pid
 
-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:
-
-    ---
-      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
-
-This log is enabled by default but if we don't need it or we are using another logger system we can also disable it:
-
-    ---
-      extension:
-        daemon:
-          nolog:
-
 The extension also allows to add new JVM arguments to run the daemon with. They just need to be added into the configuration file:
 
     ---
@@ -57,6 +40,10 @@ The extension also allows to add new JVM arguments to run the daemon with. They
 
 You can find further information on how to write your own extension in the wiki: http://wiki.github.com/calavera/trinidad/extensions
 
+# DEVELOPMENT
+
+Copy the hooks into git-hooks directory to .git/hooks to make sure the jar file is updated when the java code is modified.
+
 # Copyright
 
 Copyright (c) 2010 David Calavera. See LICENSE for details.

data/Rakefile

@@ -123,13 +123,11 @@ task :gemspec => :validate do
     split("\n").
     sort.
     reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg|src)/ }.
+    reject { |file| file =~ /^(rdoc|pkg|src|git-hooks)/ }.
     reject { |file| file =~ /tomcat-core.jar/ }.
     map { |file| "    #{file}" }.
     join("\n")
 
-  files << "\n    trinidad-libs/trinidad-daemon-extension.jar"
-
   # piece file back together and write
   manifest = "  s.files = %w[\n#{files}\n  ]\n"
   spec = [head, manifest, tail].join("  # = MANIFEST =\n")

data/lib/trinidad_daemon_extension.rb

@@ -9,32 +9,16 @@ require File.expand_path('../../trinidad-libs/trinidad-daemon-extension', __FILE
 module Trinidad
   module Extensions
     module Daemon
-      VERSION = '0.2.6'
+      VERSION = '0.2.7'
     end
 
     class DaemonServerExtension < ServerExtension
       def configure(tomcat)
-        org.jruby.trinidad.TrinidadDaemon.new(tomcat, @options[:pid_file], logger_options, jvm_args)
+        org.jruby.trinidad.TrinidadDaemon.new(tomcat, @options[:pid_file], jvm_args)
       end
 
       def override_tomcat?; true; end
 
-      def logger_options
-        return if @options.has_key?(:nolog)
-        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"
-          level = 'INFO'
-        end
-        log[:level] = level
-        log = Hash[log.map{|k, v| [k.to_s, v]}]
-
-        Java::java.util.HashMap.new(log)
-      end
-
       def jvm_args
         (@options[:jvm_args] ? @options[:jvm_args].split : []).to_java(:string)
       end

data/spec/trinidad_daemon_extension_spec.rb

@@ -25,37 +25,6 @@ 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 == 'INFO'
-  end
-
   it "allows to pass jvm arguments to the daemon" do
     extension = Trinidad::Extensions::DaemonServerExtension.new({
       :jvm_args => '-Xmx=2048m -XX:MaxPermSize=2048m'

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.2.6'
-  s.date              = '2011-02-22'
+  s.version           = '0.2.7'
+  s.date              = '2011-03-19'
   s.rubyforge_project = 'trinidad_daemon_extension'
 
   ## Make sure your summary is short. The description may be as long
@@ -62,8 +62,8 @@ Gem::Specification.new do |s|
     spec/spec_helper.rb
     spec/trinidad_daemon_extension_spec.rb
     trinidad-libs/akuma.jar
-    trinidad_daemon_extension.gemspec
     trinidad-libs/trinidad-daemon-extension.jar
+    trinidad_daemon_extension.gemspec
   ]
   # = MANIFEST =
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad_daemon_extension
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 2
-    - 6
-  version: 0.2.6
+  prerelease: 
+  version: 0.2.7
 platform: ruby
 authors: 
   - David Calavera
@@ -14,20 +10,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 +01:00
+date: 2011-03-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: trinidad_jars
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 1
-              - 1
             version: 0.1.1
     type: :runtime
     version_requirements: *id001
@@ -35,11 +28,10 @@ dependencies:
     name: rspec
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :development
     version_requirements: *id002
@@ -47,11 +39,10 @@ dependencies:
     name: mocha
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :development
     version_requirements: *id003
@@ -75,8 +66,8 @@ files:
   - spec/spec_helper.rb
   - spec/trinidad_daemon_extension_spec.rb
   - trinidad-libs/akuma.jar
-  - trinidad_daemon_extension.gemspec
   - trinidad-libs/trinidad-daemon-extension.jar
+  - trinidad_daemon_extension.gemspec
 has_rdoc: true
 homepage: http://github.com/calavera/trinidad_daemon_extension
 licenses: []
@@ -87,23 +78,21 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: trinidad_daemon_extension
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 2
 summary: Trinidad daemon extension