oversip 1.0.5 → 1.0.6.beta1

data/bin/oversip

@@ -2,9 +2,15 @@
 # -*- encoding: binary -*-
 
 unless RUBY_VERSION >= "1.9.2"
-  raise LoadError, "OverSIP requires Ruby version >= 1.9.2 (current version is #{RUBY_VERSION})"
+  raise ::LoadError, "OverSIP requires Ruby version >= 1.9.2 (current version is #{RUBY_VERSION})"
 end
 
+# When OverSIP is executed automaticaly via the system init (i.e. after booting the host)
+# the Encoding.default_external is US_ASCII which causes fails when reading daat from
+# some files (i.e. the cacert.pem file which contains no valid US_ASCII symbols). So
+# make the default external encoding UTF-8 right now.
+::Encoding.default_external = ::Encoding::UTF_8
+
 # First of all, trap some signals in order to ignore them if they arrive while
 # loading server libraries.
 [:HUP, :INT, :USR1, :USR2].each {|signal| trap(signal) {} }
@@ -73,7 +79,7 @@ module OverSIP
           require "posix_mq"
 
           begin
-            POSIX_MQ.unlink value
+            ::POSIX_MQ.unlink value
           rescue ::Errno::ENOENT
           rescue ::Errno::EACCES => e
             fatal "cannot remove '#{value}' posix message queue due file permissions"
@@ -141,7 +147,7 @@ module OverSIP
       end
 
       # Ignore user/group if the launcher is not being running as root.
-      unless Process.euid == 0
+      unless ::Process.euid == 0
         log_system_warn "ignoring user/group parameters when not running as root"
         options.delete :user
         options.delete :group
@@ -149,15 +155,15 @@ module OverSIP
         # Get the uid and gid to run with.
         if options[:user]
           begin
-            Etc.getpwnam options[:user]
-          rescue ArgumentError
+            ::Etc.getpwnam options[:user]
+          rescue ::ArgumentError
             fatal "user '#{options[:user]}' does not exist in the system"
           end
         end
         if options[:group]
           begin
-            Etc.getgrnam options[:group]
-          rescue ArgumentError
+            ::Etc.getgrnam options[:group]
+          rescue ::ArgumentError
             fatal "group '#{options[:group]}' does not exist in the system"
           end
         end
@@ -170,21 +176,21 @@ module OverSIP
 
       # Set the command name (as it appears in "ps" output) to given --process_name option (-p)
       # or to the script filename otherwise.
-      $0 = options[:process_name] || File.basename(__FILE__)
+      $0 = options[:process_name] || ::File.basename(__FILE__)
 
-      OverSIP.master_name = $0
-      log_system_info "master process name: #{OverSIP.master_name}"
+      ::OverSIP.master_name = $0
+      log_system_info "master process name: #{::OverSIP.master_name}"
 
-      OverSIP::Config.load options[:config_dir], options[:config_file]
+      ::OverSIP::Config.load options[:config_dir], options[:config_file]
       log_system_info "applied configuration:"
-      OverSIP::Config.print options[:colorize]
+      ::OverSIP::Config.print options[:colorize]
 
       log_system_info "creating Posix Message Queue for communicating master and syslogger processes"
-      OverSIP::Logger.init_logger_mq options[:num_instances], options[:group]
-      OverSIP::Logger.load_methods
+      ::OverSIP::Logger.init_logger_mq options[:num_instances], options[:group]
+      ::OverSIP::Logger.load_methods
 
-      OverSIP::Launcher.daemonize!(options)
-      OverSIP::Launcher.run(options)
+      ::OverSIP::Launcher.daemonize!(options)
+      ::OverSIP::Launcher.run(options)
 
     end  # def run
   end  # class Executable

data/lib/oversip/config.rb

@@ -313,6 +313,14 @@ module OverSIP
         @configuration[:websocket][:enable_ipv6] = nil
       end
 
+      unless @configuration[:websocket][:enable_ipv4]
+        @configuration[:websocket][:listen_ipv4] = nil
+      end
+
+      unless @configuration[:websocket][:enable_ipv6]
+        @configuration[:websocket][:listen_ipv6] = nil
+      end
+
       if ( @use_sip_udp_or_tcp or @use_sip_tls ) and @configuration[:sip][:listen_ipv4] == nil and @configuration[:sip][:enable_ipv4]
         unless (@configuration[:sip][:listen_ipv4] = discover_local_ip(:ipv4))
           log_system_warn "dissabling IPv4 for SIP"

data/lib/oversip/launcher.rb

@@ -92,7 +92,7 @@ module OverSIP::Launcher
       ready_pipe.write($$.to_s + "\n") if ready_pipe
 
       # I'm master process.
-      if syslogger_pid = fork
+      if (syslogger_pid = fork) != nil
         ::OverSIP.syslogger_pid = syslogger_pid
         log_system_info "starting syslogger process (PID #{syslogger_pid})..."
         ::OverSIP::Logger.load_methods

data/lib/oversip/posix_mq.rb

@@ -55,17 +55,19 @@ module OverSIP
       # If --num-instances is given, then multiply it by its value.
       mq_size *= options[:num_instances]
 
-      log_system_debug "queue requires #{mq_size} bytes"  if $oversip_debug
+      log_system_info "queue requires #{mq_size} bytes"
 
       # Set RLIMIT_MSGQUEUE (ulimit) in order to create the queue with required
       # ammount of memory.
       if ( current_rlimit = ::Process.getrlimit(12)[1] ) < mq_size
-        log_system_debug "incrementing rlimits (currently #{current_rlimit} bytes) to #{mq_size} bytes (ulimit -q)"  if $oversip_debug
+        log_system_info "incrementing rlimits for Posix Message Queues (currently #{current_rlimit} bytes) to #{mq_size} bytes (ulimit -q)"
         begin
           ::Process.setrlimit(12, mq_size)
         rescue ::Errno::EPERM
           fatal "current user has no permissions to increase rlimits to #{mq_size} bytes (ulimit -q)"
         end
+      else
+        log_system_info "rlimits for Posix Message Queues is #{current_rlimit} bytes (>= #{mq_size}), no need to increase it"
       end
 
       # Create the Posix message queue to write into it.

data/lib/oversip/version.rb

@@ -5,8 +5,8 @@ module OverSIP
   module Version
     MAJOR = 1
     MINOR = 0
-    TINY  = 5
-    DEVEL = nil  # Set to nil for stable releases.
+    TINY  = 6
+    DEVEL = "beta1"  # Set to nil for stable releases.
   end
 
   PROGRAM_NAME     = "OverSIP"

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: oversip
 version: !ruby/object:Gem::Version
-  version: 1.0.5
-  prerelease: 
+  version: 1.0.6.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Inaki Baz Castillo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine-le
-  requirement: &23702300 !ruby/object:Gem::Requirement
+  requirement: &19017300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *23702300
+  version_requirements: *19017300
 - !ruby/object:Gem::Dependency
   name: iobuffer
-  requirement: &23701840 !ruby/object:Gem::Requirement
+  requirement: &19016840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *23701840
+  version_requirements: *19016840
 - !ruby/object:Gem::Dependency
   name: em-posixmq
-  requirement: &23701380 !ruby/object:Gem::Requirement
+  requirement: &19016380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *23701380
+  version_requirements: *19016380
 - !ruby/object:Gem::Dependency
   name: em-udns
-  requirement: &23717300 !ruby/object:Gem::Requirement
+  requirement: &19032300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *23717300
+  version_requirements: *19032300
 - !ruby/object:Gem::Dependency
   name: escape_utils
-  requirement: &23716840 !ruby/object:Gem::Requirement
+  requirement: &19031840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *23716840
+  version_requirements: *19031840
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &23716460 !ruby/object:Gem::Requirement
+  requirement: &19031460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23716460
+  version_requirements: *19031460
 - !ruby/object:Gem::Dependency
   name: posix-spawn
-  requirement: &23715920 !ruby/object:Gem::Requirement
+  requirement: &19030920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *23715920
+  version_requirements: *19030920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &23715420 !ruby/object:Gem::Requirement
+  requirement: &19030420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *23715420
+  version_requirements: *19030420
 description: ! "OverSIP is an async SIP server. Built on top of Ruby EventMachine\n
   \   library it follows the Reactor Pattern, allowing thousands of concurrent connections
   and requests\n    handled by a single processor in a never-blocking fashion. It
@@ -263,9 +263,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11