juggernaut 0.5.4 → 0.5.5

data/lib/juggernaut.rb

@@ -1,10 +1,11 @@
+require 'rubygems'
 require 'logger'
 require 'eventmachine'
 require 'json'
 $:.unshift(File.dirname(__FILE__))
 
 module Juggernaut
-  VERSION   = '0.5.4'
+  VERSION   = '0.5.5'
 
   class JuggernautError < StandardError #:nodoc:
   end

data/lib/juggernaut/client.rb

@@ -145,9 +145,10 @@ module Juggernaut
        params << "session_id=#{session_id}" if session_id
        channels.each {|chan| params << "channels[]=#{chan}" }
        url.query = params.join('&')
-       begin
+       begin         
          open(url.to_s, "User-Agent" => "Ruby/#{RUBY_VERSION}")
-       rescue
+       rescue => e
+         logger.debug("Bad response from #{url.to_s}: #{e}")
          return false
        end
        true

data/lib/juggernaut/runner.rb

@@ -31,7 +31,7 @@ module Juggernaut
       parse_options
       
       if !File.exists?(config_path)
-        puts "You must generate a config file (juggernaut -g)"
+        puts "You must generate a config file (juggernaut -g filename.yml)"
         exit
       end
       
@@ -62,10 +62,17 @@ module Juggernaut
         stop
         exit
       }
+
+      if options[:descriptor_table_size]
+        EM.epoll
+        new_size = EM.set_descriptor_table_size( options[:descriptor_table_size] )
+        logger.debug "New descriptor-table size is #{new_size}"
+      end
       
       EventMachine::run {
         EventMachine::add_periodic_timer( options[:cleanup_timer].to_i ) { Juggernaut::Client.send_logouts_after_timeout }
         EventMachine::start_server(options[:host], options[:port].to_i, Juggernaut::Server)
+        EM.set_effective_user( options[:user] ) if options[:user]
       }
     end
     
@@ -105,6 +112,10 @@ module Juggernaut
         opts.on("-p", "--port PORT", Integer, "Specify port", "(default: #{options[:port]})") do |v|
           options[:port] = v
         end
+
+        opts.on("-s", "--fdsize SIZE", Integer, "Set the file descriptor size an user epoll() on Linux", "(default: use select() which is limited to 1024 clients)") do |v|
+          options[:descriptor_table_size] = v
+        end
         
         opts.separator ""; opts.separator "Daemonization:"
         
@@ -116,7 +127,7 @@ module Juggernaut
           options[:daemonize] = v
         end
 
-        opts.on("-k", "--kill PORT", String, "Kill specified running daemons - leave blank to kill all.") do |v|
+        opts.on("-k", "--kill PORT", String, :OPTIONAL, "Kill specified running daemons - leave blank to kill all.") do |v|
           options[:kill] = v
         end
         

data/lib/juggernaut/server.rb

@@ -350,13 +350,15 @@ module Juggernaut
         url = URI.parse(options[:broadcast_query_login_url])
         params = []
         params << "client_id=#{@request[:client_id]}" if @request[:client_id]
-        params << "session_id=#{@request[:session_id]}" if @request[:session_id]
+        params << "session_id=#{URI.escape(@request[:session_id])}" if @request[:session_id]
         params << "type=#{@request[:type]}"
         params << "command=#{@request[:command]}"
         (@request[:channels] || []).each {|chan| params << "channels[]=#{chan}" }
         url.query = params.join('&')
         begin
           open(url.to_s, "User-Agent" => "Ruby/#{RUBY_VERSION}")
+        rescue Timeout::Error
+          return false
         rescue
           return false
         end

metadata

@@ -1,66 +1,22 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: juggernaut
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
-date: 2008-04-04 00:00:00 +01:00
-summary: FIX (describe your package)
-require_paths: 
-- lib
-email: info@eribium.org
-homepage: http://juggernaut.rubyforge.org
-rubyforge_project: juggernaut
-description: FIX (describe your package)
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.5.5
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Alex MacCaw
-files: 
-- History.txt
-- Manifest.txt
-- README.txt
-- Rakefile
-- bin/juggernaut
-- lib/juggernaut.rb
-- lib/juggernaut/client.rb
-- lib/juggernaut/message.rb
-- lib/juggernaut/miscel.rb
-- lib/juggernaut/runner.rb
-- lib/juggernaut/server.rb
-- lib/juggernaut/utils.rb
-test_files: []
-
-rdoc_options: 
-- --main
-- README.txt
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-executables: 
-- juggernaut
-extensions: []
-
-requirements: []
+autorequire: 
+bindir: bin
+cert_chain: []
 
+date: 2008-08-03 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -68,8 +24,9 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: json
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -77,10 +34,63 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.7.0
     version: 
+description: FIX (describe your package)
+email: info@eribium.org
+executables: 
+- juggernaut
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
+files: 
+- History.txt
+- Manifest.txt
+- README.txt
+- Rakefile
+- bin/juggernaut
+- lib/juggernaut.rb
+- lib/juggernaut/client.rb
+- lib/juggernaut/message.rb
+- lib/juggernaut/miscel.rb
+- lib/juggernaut/runner.rb
+- lib/juggernaut/server.rb
+- lib/juggernaut/utils.rb
+has_rdoc: true
+homepage: http://juggernaut.rubyforge.org
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: juggernaut
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: FIX (describe your package)
+test_files: []
+