oversip 1.4.1 → 2.0.0

data/lib/oversip/launcher.rb

@@ -30,15 +30,15 @@ module OverSIP::Launcher
     if grandparent == $$
       # Master process will inmediatelly write in the ready_pipe its PID so we get
       # its PID.
-      master_pid = nil
+      pid = nil
       begin
         ::Timeout.timeout(READY_PIPE_TIMEOUT/2) do
-          master_pid = rd.gets("\n").to_i rescue nil
+          pid = rd.gets("\n").to_i rescue nil
         end
       rescue ::Timeout::Error
         fatal "master process didn't notify its PID within #{READY_PIPE_TIMEOUT/2} seconds"
       end
-      unless master_pid
+      unless pid
         fatal "master process failed to start"
       end
 
@@ -56,14 +56,14 @@ module OverSIP::Launcher
       rescue ::Timeout::Error
         log_system_crit "master process is not ready within #{READY_PIPE_TIMEOUT/2} seconds, killing it..."
         begin
-          ::Process.kill(:TERM, master_pid)
+          ::Process.kill(:TERM, pid)
           10.times do |i|
             sleep 0.05
-            ::Process.wait(master_pid, ::Process::WNOHANG) rescue nil
-            ::Process.kill(0, master_pid) rescue break
+            ::Process.wait(pid, ::Process::WNOHANG) rescue nil
+            ::Process.kill(0, pid) rescue break
           end
-          ::Process.kill(0, master_pid)
-          ::Process.kill(:KILL, master_pid) rescue nil
+          ::Process.kill(0, pid)
+          ::Process.kill(:KILL, pid) rescue nil
         rescue ::Errno::ESRCH
         end
         fatal "master process killed"
@@ -88,7 +88,7 @@ module OverSIP::Launcher
     configuration = ::OverSIP.configuration
 
     # Store the master process PID.
-    ::OverSIP.master_pid = $$
+    ::OverSIP.pid = $$
 
     begin
       # Inmediatelly write into the ready_pipe so grandparent process reads it
@@ -96,31 +96,13 @@ module OverSIP::Launcher
       ready_pipe = options.delete(:ready_pipe)
       ready_pipe.write($$.to_s + "\n") if ready_pipe
 
-      # I'm master process.
-      if (syslogger_pid = fork) != nil
-        ::OverSIP.syslogger_pid = syslogger_pid
-        ::OverSIP::Logger.load_methods
-
-        # Load all the libraries for the master process.
-        require "oversip/master_process.rb"
-
-        ::OverSIP::TLS.module_init
-        ::OverSIP::SIP.module_init
-        ::OverSIP::SIP::RFC3263.module_init
-        ::OverSIP::WebSocket.module_init
-        ::OverSIP::WebSocket::WsFraming.class_init
-        ::OverSIP::WebSocket::WsSipApp.class_init
-
-      # I'm the syslogger process.
-      else
-        # Close the pipe in the syslogger process.
-        ready_pipe.close rescue nil
-        ready_pipe = nil
-
-        require "oversip/syslogger_process.rb"
-        ::OverSIP::SysLoggerProcess.run options
-        exit
-      end
+      # Init modules.
+      ::OverSIP::TLS.module_init
+      ::OverSIP::SIP.module_init
+      ::OverSIP::SIP::RFC3263.module_init
+      ::OverSIP::WebSocket.module_init
+      ::OverSIP::WebSocket::WsFraming.class_init
+      ::OverSIP::WebSocket::WsSipApp.class_init
 
       @log_id = "launcher (master)"
 
@@ -152,7 +134,7 @@ module OverSIP::Launcher
         ::Fiber.new do
 
           # Run OverSIP::SystemEvents.on_initialize.
-          log_system_notice "calling OverSIP::SystemEvents.on_initialize() method..."
+          log_system_debug "calling OverSIP::SystemEvents.on_initialize() method..."
           begin
             ::OverSIP::SystemEvents.on_initialize
           rescue ::Exception => e
@@ -161,7 +143,7 @@ module OverSIP::Launcher
           end
 
           # Run all the OverSIP::SystemCallbacks.on_started_callbacks.
-          log_system_notice "executing OverSIP::SystemCallbacks.on_started_callbacks..."
+          log_system_debug "executing OverSIP::SystemCallbacks.on_started_callbacks..."
           ::OverSIP::SystemCallbacks.on_started_callbacks.each do |cb|
             begin
               cb.call
@@ -172,7 +154,7 @@ module OverSIP::Launcher
           end
 
           # Run OverSIP::SystemEvents.on_started within a fiber.
-          log_system_notice "calling OverSIP::SystemEvents.on_started() method..."
+          log_system_debug "calling OverSIP::SystemEvents.on_started() method..."
           begin
             ::OverSIP::SystemEvents.on_started
           rescue ::Exception => e
@@ -180,7 +162,6 @@ module OverSIP::Launcher
             fatal e
           end
 
-          log_system_notice "master process (PID #{$$}) ready"
           log_system_notice "#{::OverSIP::PROGRAM_NAME} #{::OverSIP::VERSION} running in background"
 
           # Write "ok" into the ready_pipe so grandparent process (launcher)
@@ -195,7 +176,8 @@ module OverSIP::Launcher
           $stdout.reopen("/dev/null")
           $stderr.reopen("/dev/null")
           ::OverSIP.daemonized = true
-          # So update the logger to write to syslog.
+
+          # So update the logger to stop writting into stdout.
           ::OverSIP::Logger.load_methods
 
           # Set the EventMachine error handler.
@@ -458,12 +440,15 @@ module OverSIP::Launcher
           log_system_notice "#{signal.to_s.upcase} signal received, ignored"
         end
       rescue ::ArgumentError
-        log_system_notice "cannot trap signal #{signal.to_s.upcase}, it could not exist in this system, ignoring it"
+        log_system_debug "cannot trap signal #{signal.to_s.upcase}, it could not exist in this system, ignoring it"
       end
     end
 
-    # Special treatment for VTALRM signal (TODO: since it occurs too much).
-    trap :VTALRM do
+    # Ruby 2.0 does not allow trapping VTALRM signal. For other cases ignore it.
+    begin
+      trap :VTALRM do
+      end
+    rescue ::ArgumentError
     end
 
     # Signal HUP reloads OverSIP system configuration.
@@ -554,12 +539,6 @@ module OverSIP::Launcher
       kill_stud_processes
       ::File.delete ::OverSIP.configuration[:tls][:full_cert]  rescue nil
 
-      # Wait a bit so pending log messages in the Posix MQ can be queued.
-      sleep 0.1
-      ::OverSIP::Logger.close
-
-      kill_syslogger_process
-
       delete_pid_file
 
       # Exit by preventing any exception.
@@ -570,29 +549,12 @@ module OverSIP::Launcher
 
 
   def self.delete_pid_file
-    return false  unless ::OverSIP.master_pid
+    return false  unless ::OverSIP.pid
 
     ::File.delete(::OverSIP.pid_file) rescue nil
   end
 
 
-  def self.kill_syslogger_process
-    return false  unless ::OverSIP.master_pid
-
-    begin
-      ::Process.kill(:TERM, ::OverSIP.syslogger_pid)
-      10.times do |i|
-        sleep 0.05
-        ::Process.wait(::OverSIP.syslogger_pid, ::Process::WNOHANG) rescue nil
-        ::Process.kill(0, ::OverSIP.syslogger_pid) rescue break
-      end
-      ::Process.kill(0, ::OverSIP.syslogger_pid)
-      ::Process.kill(:KILL, ::OverSIP.syslogger_pid) rescue nil
-    rescue ::Errno::ESRCH
-    end
-  end
-
-
   def self.set_user_group user, group
     uid = ::Etc.getpwnam(user).uid  if user
     gid = ::Etc.getgrnam(group).gid  if group
@@ -651,7 +613,7 @@ module OverSIP::Launcher
 
 
   def self.kill_stud_processes
-    return false  unless ::OverSIP.master_pid
+    return false  unless ::OverSIP.pid
     return false  unless ::OverSIP.stud_pids
 
     ::OverSIP.stud_pids.each do |pid|

data/lib/oversip/logger.rb

@@ -1,30 +1,16 @@
 module OverSIP
 
   # Logging client module. Any class desiring to log messages must include (or extend) this module.
-  # In order to identify itself in the logs, the class can define log_ig() method or set @log_id
+  # In order to identify itself in the logs, the class can define log_id() method or set @log_id
   # attribute.
   module Logger
 
-    def self.init_logger_mq group=nil
-      @@logger_mq = ::OverSIP::PosixMQ.create_queue({
-        :name    => ::OverSIP.syslogger_mq_name,
-        :mode    => :write,
-        :maxmsg  => 1000,
-        :msgsize => 2000,
-        :group => group
-      })
-    end
-
-
     def self.load_methods
-      # When not yet daemonized, also log to syslog.
-      if not ::OverSIP.daemonized?
-        ::Syslog.close  if ::Syslog.opened?
+      ::Syslog.close  if ::Syslog.opened?
 
-        syslog_options = ::Syslog::LOG_PID | ::Syslog::LOG_NDELAY
-        syslog_facility = ::OverSIP::Syslog::SYSLOG_FACILITY_MAPPING[::OverSIP.configuration[:core][:syslog_facility]] rescue ::Syslog::LOG_DAEMON
-        ::Syslog.open(::OverSIP.master_name, syslog_options, syslog_facility)
-      end
+      syslog_options = ::Syslog::LOG_PID | ::Syslog::LOG_NDELAY
+      syslog_facility = ::OverSIP::Syslog::SYSLOG_FACILITY_MAPPING[::OverSIP.configuration[:core][:syslog_facility]] rescue ::Syslog::LOG_DAEMON
+      ::Syslog.open(::OverSIP.master_name, syslog_options, syslog_facility)
 
       begin
         @@threshold = ::OverSIP::Syslog::SYSLOG_SEVERITY_MAPPING[::OverSIP.configuration[:core][:syslog_level]]
@@ -34,46 +20,25 @@ module OverSIP
 
       $oversip_debug = ( @@threshold == 0 ? true : false )
 
-      @@congested = false
-
-      ::OverSIP::Syslog::SYSLOG_SEVERITY_MAPPING.each do |level, level_value|
+      ::OverSIP::Syslog::SYSLOG_SEVERITY_MAPPING.each do |level_str, level_value|
         method_str = "
-          def log_system_#{level}(msg)
+          def log_system_#{level_str}(msg)
         "
 
-        if ::OverSIP.syslogger_ready?
-          method_str << "
-            return false if @@threshold > #{level_value} || @@congested
-            begin
-              unless @@logger_mq.trysend ::OverSIP::Logger.syslog_system_msg2str(#{level_value}, msg, log_id), 0
-                @@congested = true
-                ::EM.add_timer(1) do
-                  @@logger_mq.trysend ::OverSIP::Logger.syslog_system_msg2str(4, \"logger message queue was full, some logs have been lost\", log_id), 1
-                  @@congested = false
-                end
-              end
-            rescue ::Errno::EMSGSIZE
-              @@logger_mq.trysend ::OverSIP::Logger.syslog_system_msg2str(4, \"too long message could not be logged\", log_id), 1 rescue nil
-            rescue ::Exception => e
-              @@logger_mq.trysend ::OverSIP::Logger.syslog_system_msg2str(4, \"unexpected logging error (\#{e.class}: \#{e.message})\", log_id), 1 rescue nil
-            end
-          "
-        end
+        method_str << "
+          return false if @@threshold > #{level_value}
+
+          ::OverSIP::Syslog.log #{level_value}, msg, log_id, false
+        "
 
         if not ::OverSIP.daemonized?
-          if %w{debug info notice}.include? level
+          if %w{debug info notice}.include? level_str
             method_str << "
-              puts ::OverSIP::Logger.fg_system_msg2str('#{level}', msg, log_id)
-              if not ::OverSIP.syslogger_ready?
-                ::OverSIP::Syslog.log ::OverSIP::Logger.syslog_system_msg2str(#{level_value}, msg, log_id)
-              end
-            "
+              puts ::OverSIP::Logger.fg_system_msg2str('#{level_str}', msg, log_id)
+              "
           else
             method_str << "
-              $stderr.puts ::OverSIP::Logger.fg_system_msg2str('#{level}', msg, log_id)
-              if not ::OverSIP.syslogger_ready?
-                ::OverSIP::Syslog.log ::OverSIP::Logger.syslog_system_msg2str(#{level_value}, msg, log_id)
-              end
+              $stderr.puts ::OverSIP::Logger.fg_system_msg2str('#{level_str}', msg, log_id)
             "
           end
         end
@@ -83,75 +48,31 @@ module OverSIP
         self.module_eval method_str
 
 
-        if ::OverSIP.syslogger_ready?
-          # User logs.
-          method_str = "
-            def log_#{level}(msg)
-              return false if @@threshold > #{level_value} || @@congested
-              begin
-                unless @@logger_mq.trysend ::OverSIP::Logger.syslog_user_msg2str(#{level_value}, msg, log_id), 0
-                  @@congested = true
-                  ::EM.add_timer(1) do
-                    @@logger_mq.trysend ::OverSIP::Logger.syslog_user_msg2str(4, \"logger message queue was full, some logs have been lost\", log_id), 1
-                    @@congested = false
-                  end
-                end
-              rescue ::Errno::EMSGSIZE
-                @@logger_mq.trysend ::OverSIP::Logger.syslog_user_msg2str(4, \"too long message could not be logged\", log_id), 1 rescue nil
-              rescue ::Exception => e
-                @@logger_mq.trysend ::OverSIP::Logger.syslog_user_msg2str(4, \"unexpected logging error (\#{e.class}: \#{e.message})\", log_id), 1 rescue nil
-              end
-            end
-          "
-
-          self.module_eval method_str
-        end
+        # User logs.
+        method_str = "
+          def log_#{level_str}(msg)
+            return false if @@threshold > #{level_value}
 
-      end  # .each
-    end
+            ::OverSIP::Syslog.log #{level_value}, msg, log_id, true
+          end
+        "
 
-    # Generate nice log messages. It accepst three parameters:
-    # - level_value: Integer representing the log level.
-    # - msg: the String or Exception to be logged.
-    # - log_id: a String helping to identify the generator of this log message.
-    def self.syslog_system_msg2str(level_value, msg, log_id)
-      case msg
-      when ::String
-        level_value.to_s << "<" << log_id << "> " << msg
-      when ::Exception
-        "#{level_value}<#{log_id}> #{msg.message} (#{msg.class })\n#{(msg.backtrace || [])[0..3].join("\n")}"
-      else
-        level_value.to_s << "<" << log_id << "> " << msg.inspect
-      end
-    end
+        self.module_eval method_str
 
-    def self.syslog_user_msg2str(level_value, msg, log_id)
-      case msg
-      when ::String
-        level_value.to_s << "<" << log_id << "> [user] " << msg
-      when ::Exception
-        "#{level_value}<#{log_id}> [user] #{msg.message} (#{msg.class })\n#{(msg.backtrace || [])[0..3].join("\n")}"
-      else
-        level_value.to_s << "<" << log_id << "> [user] " << msg.inspect
-      end
+      end  # .each
     end
 
-    def self.fg_system_msg2str(level, msg, log_id)
+    def self.fg_system_msg2str(level_str, msg, log_id)
       case msg
       when ::String
-        "#{level.upcase}: <#{log_id}> " << msg
+        "#{level_str.upcase}: <#{log_id}> " << msg
       when ::Exception
-        "#{level.upcase}: <#{log_id}> #{msg.message} (#{msg.class })\n#{(msg.backtrace || [])[0..3].join("\n")}"
+        "#{level_str.upcase}: <#{log_id}> #{msg.message} (#{msg.class })\n#{(msg.backtrace || [])[0..3].join("\n")}"
       else
-        "#{level.upcase}: <#{log_id}> " << msg.inspect
+        "#{level_str.upcase}: <#{log_id}> " << msg.inspect
       end
     end
 
-    def self.close
-      @@logger_mq.close rescue nil
-      @@logger_mq.unlink rescue nil
-    end
-
     # Default logging identifier is the class name. If log_id() method is redefined by the
     # class including this module, or it sets @log_id, then such a value takes preference.
     def log_id

data/lib/oversip/sip/launcher.rb

@@ -101,7 +101,7 @@ module OverSIP::SIP
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 300
+              conn.set_comm_inactivity_timeout 7200
             end
           end
 
@@ -119,7 +119,7 @@ module OverSIP::SIP
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 300
+              conn.set_comm_inactivity_timeout 7200
             end
           end
 
@@ -139,7 +139,7 @@ module OverSIP::SIP
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 300
+              conn.set_comm_inactivity_timeout 7200
             end
           end
 
@@ -159,7 +159,7 @@ module OverSIP::SIP
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 300
+              conn.set_comm_inactivity_timeout 7200
             end
           end
 
@@ -179,7 +179,7 @@ module OverSIP::SIP
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 300
+              conn.set_comm_inactivity_timeout 7200
             end
           end
 
@@ -199,7 +199,7 @@ module OverSIP::SIP
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 300
+              conn.set_comm_inactivity_timeout 7200
             end
           end
 
@@ -218,4 +218,4 @@ module OverSIP::SIP
 
   end
 
-end
+end

data/lib/oversip/syslog.rb

@@ -27,26 +27,36 @@ module OverSIP
       "emerg"  => 7
     }
 
-    def self.log string
-      level = string.getbyte 0
-      msg   = string[1..-1].gsub(/%/,"%%").gsub(/\x00/,"")
+    def self.log level_value, msg, log_id, user
+      user = user ? " [user] " : " "
 
-      case level
-      when 48  # "0" =>DEBUG
+      msg = case msg
+      when ::String
+        "<#{log_id}>#{user}#{msg}"
+      when ::Exception
+        "<#{log_id}>#{user}#{msg.message} (#{msg.class })\n#{(msg.backtrace || [])[0..3].join("\n")}"
+      else
+        "<#{log_id}>#{user}#{msg.inspect}"
+      end
+
+      msg = msg.gsub(/%/,"%%").gsub(/\x00/,"")
+
+      case level_value
+      when 0
         ::Syslog.debug sprintf("%7s %s", "DEBUG:", msg)
-      when 49  # "1" => INFO
+      when 1
         ::Syslog.info sprintf("%7s %s", "INFO:", msg)
-      when 50  # "2" => NOTICE
+      when 2
         ::Syslog.notice sprintf("%7s %s", "NOTICE:", msg)
-      when 51  # "3" => WARN
+      when 3
         ::Syslog.warning sprintf("%7s %s", "WARN:", msg)
-      when 52  # "4" => ERR
+      when 4
         ::Syslog.err sprintf("%7s %s", "ERROR:", msg)
-      when 53  # "5" => CRIT
+      when 5
         ::Syslog.crit sprintf("%7s %s", "CRIT:", msg)
-      when 54  # "6" => ALERT
+      when 6
         ::Syslog.alert sprintf("%7s %s", "ALERT:", msg)
-      when 55  # "7" => EMERG
+      when 7
         ::Syslog.emerg sprintf("%7s %s", "EMERG:", msg)
       else  # Shouldn't occur.
         ::Syslog.err sprintf("%7s %s", "UNKNOWN:", msg)

data/lib/oversip/version.rb

@@ -3,9 +3,9 @@
 module OverSIP
 
   module Version
-    MAJOR = 1
-    MINOR = 4
-    TINY  = 1
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 0
     DEVEL = nil  # Set to nil for stable releases.
   end
 
@@ -15,7 +15,7 @@ module OverSIP
   AUTHOR = "Inaki Baz Castillo"
   AUTHOR_EMAIL = "ibc@aliax.net"
   HOMEPAGE = "http://www.oversip.net"
-  year = "2012-2013"
-  DESCRIPTION = "#{PROGRAM_NAME} #{VERSION}\n#{HOMEPAGE}\n#{year}, #{AUTHOR} <#{AUTHOR_EMAIL}>\nSoftware by Versatica: http://www.versatica.com"
+  year = "2012-2014"
+  DESCRIPTION = "#{PROGRAM_NAME} #{VERSION}\n#{HOMEPAGE}\n#{year}, #{AUTHOR} <#{AUTHOR_EMAIL}>"
 
 end

data/lib/oversip/websocket/launcher.rb

@@ -63,7 +63,7 @@ module OverSIP::WebSocket
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 300
+              conn.set_comm_inactivity_timeout 7200
             end
           end
 
@@ -81,7 +81,7 @@ module OverSIP::WebSocket
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 300
+              conn.set_comm_inactivity_timeout 7200
             end
           end
 
@@ -101,7 +101,7 @@ module OverSIP::WebSocket
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 300
+              conn.set_comm_inactivity_timeout 7200
             end
           end
 
@@ -121,7 +121,7 @@ module OverSIP::WebSocket
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 300
+              conn.set_comm_inactivity_timeout 7200
             end
           end
 
@@ -141,7 +141,7 @@ module OverSIP::WebSocket
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 300
+              conn.set_comm_inactivity_timeout 7200
             end
           end
 
@@ -161,7 +161,7 @@ module OverSIP::WebSocket
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 300
+              conn.set_comm_inactivity_timeout 7200
             end
           end
 
@@ -180,4 +180,4 @@ module OverSIP::WebSocket
 
   end
 
-end
+end