rsence-pre 2.2.0.4 → 2.2.0.5

data/VERSION

@@ -1 +1 @@
-2.2.0.4.pre
+2.2.0.5.pre

data/conf/default_conf.yaml

@@ -36,6 +36,19 @@
     # how many milliseconds to wait before doing an idle poll
     :server_poll_interval: 2000 # 2 seconds
   #
+  # The settings for the daemon
+  :daemon:
+    #
+    # How long to wait before binding the broker to the
+    # HTTP address and port after starting the Transporter.
+    # A value of -1 disables the broker completely.
+    # Before waiting, the daemon starts all subsystems except the
+    # http handling front-end (Broker).
+    # Useful in situations where RSence itself configures the
+    # network interfaces or the interfaces become available after
+    # RSence is started.
+    :http_delayed_start: 0
+  #
   # Switches on debug-mode:
   #  - Generates more output
   #  - Each time /hello is post-requested:

data/conf/rsence_command_strings.yaml

@@ -278,6 +278,16 @@
                               Only available on Mac OS X and other systems with a
                               'say' command installed.
   
+      --http-delayed-start <number>  Waits for <number> of seconds before starting
+                                     the HTTP Broker after starting the Transporter.
+                              A value of -1 disables the broker completely.
+                              Before waiting, the daemon starts all subsystems except the
+                              http handling front-end (Broker).
+                              Useful in situations where RSence itself configures the
+                              network interfaces or the interfaces become available after
+                              RSence is started.
+
+  
   :initenv: |+
     Alias name of the 'init' command.
     

data/lib/conf/argv.rb

@@ -110,6 +110,7 @@ module RSence
         :autoupdate     => false, # -a --auto-update
         :latency        => 0,     # --latency
         :say            => false, # -S --say
+        :http_delayed_start => nil, # --http-delayed-start
       
         # client_pkg (not supported yet)
         :client_pkg_no_gzip               => false, # --build-no-gzip
@@ -128,7 +129,7 @@ module RSence
       if @argv.length >= 2
         @argv[1..-1].each_with_index do |arg,i|
           if expect_option
-            if [:port,:latency].include?(option_name) and arg.to_i.to_s != arg
+            if [ :port, :latency, :http_delayed_start ].include?(option_name) and arg.to_i.to_s != arg
               puts ERB.new( @@strs[:messages][:invalid_option_expected_number] ).result( binding )
               exit
             elsif option_name == :conf_files
@@ -138,6 +139,8 @@ module RSence
               else
                 @args[:conf_files].push( arg )
               end
+            elsif option_name == :http_delayed_start
+              @args[:http_delayed_start] = arg.to_i
             else
               arg = arg.to_i if option_name == :latency
               @args[option_name] = arg
@@ -163,6 +166,9 @@ module RSence
               elsif arg == '--addr'
                 expect_option = true
                 option_name = :addr
+              elsif arg == '--http-delayed-start'
+                expect_option = true
+                option_name = :http_delayed_start
               elsif arg == '--server'
                 expect_option = true
                 option_name = :server
@@ -793,12 +799,16 @@ module RSence
           puts version
           exit
         elsif [:run,:start,:stop,:restart].include? cmd
+          puts "RSence #{@@version} -- Ruby #{RUBY_VERSION}"
           parse_startup_argv
         elsif cmd == :status
+          puts "RSence #{@@version} -- Ruby #{RUBY_VERSION}"
           parse_status_argv
         elsif cmd == :save
+          puts "RSence #{@@version} -- Ruby #{RUBY_VERSION}"
           parse_save_argv
         elsif cmd == :initenv or cmd == :init
+          puts "RSence #{@@version} -- Ruby #{RUBY_VERSION}"
           parse_initenv_argv
         end
       else

data/lib/conf/default.rb

@@ -143,6 +143,7 @@ module RSence
       config[:http_server][:bind_address] = args[:addr] if args[:addr]
       config[:http_server][:rack_require] = args[:server] if args[:server]
       config[:session_conf][:reset_sessions] = true if args[:reset_ses]
+      config[:daemon][:http_delayed_start] = args[:http_delayed_start] if args[:http_delayed_start] != nil
     
       config[:client_pkg][:no_obfuscation] = true if args[:client_pkg_no_obfuscation]
       config[:client_pkg][:no_whitespace_removal] = true if args[:client_pkg_no_whitespace_removal]

data/lib/daemon/daemon.rb

@@ -276,9 +276,44 @@ module RSence
       "RSence-#{RSence.version} on #{url} in #{env_path}"
     end
     
+    def start_broker( conf )
+      http_delayed_seconds = RSence.config[:daemon][:http_delayed_start].to_i
+      if http_delayed_seconds == -1
+        puts "The HTTP Broker is disabled. RSence won't bind a http listener to any address."
+      else
+        if http_delayed_seconds > 0
+          puts "Delaying the start of the HTTP Broker by #{http_delayed_seconds} seconds."
+          if http_delayed_seconds > 10
+            # report when starting in 10 second intervals
+            sleep_remainder = http_delayed_seconds % 10
+            sleep_count = http_delayed_seconds / 10
+            sleep_time_left = http_delayed_seconds
+            sleep_count.times do |sleep_count_num|
+              puts "Waiting #{sleep_time_left} seconds..."
+              sleep 10
+              sleep_time_left -= 10
+            end
+            if sleep_remainder != 0
+              puts "Waiting #{sleep_remainder} seconds..."
+              sleep sleep_remainder
+            end
+          else
+            sleep http_delayed_seconds
+          end
+          puts "Starting the HTTP Broker now."
+        end
+        # This is the main http handler instance:
+        @broker = Broker.start(
+          @transporter,
+          conf
+        )
+      end
+    end
+    
     # RSence top-level run handler. Almost identical to start.
     def run
       
+      # Sets the process name
       $0 = ps_name
       
       puts "Starting as a foreground process." if RSence.args[:verbose]
@@ -291,13 +326,9 @@ module RSence
       unless RSence.args[:log_fg]
         Daemon.start_logging( self )
       end
-    
-      # This is the main http handler instance:
-      @broker = Broker.start(
-        @transporter,
-        conf
-      )
-    
+      
+      start_broker( conf )
+      
     end
     
     # Returns the pid file path.
@@ -323,24 +354,22 @@ module RSence
     # Called by Controller#start, contains RSence-specific operations
     def start
       
+      # Sets the process name
       $0 = ps_name
       
       @transporter = Transporter.new
-    
+      
       conf = RSence.config[:http_server]
-    
+      
       unless RSence.args[:log_fg]
         Daemon.start_logging( self )
         STDIN.reopen( "/dev/null" )
       end
-    
+      
       Process.setsid
-    
-      # This is the main http handler instance:
-      @broker = Broker.start(
-        @transporter,
-        conf
-      )
+      
+      start_broker( conf )
+      
       yield @broker
     
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 119
+  hash: 117
   prerelease: 
   segments: 
   - 2
   - 2
   - 0
-  - 4
-  version: 2.2.0.4
+  - 5
+  version: 2.2.0.5
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +03:00
+date: 2011-04-01 00:00:00 +03:00
 default_executable: rsence-pre
 dependencies: 
 - !ruby/object:Gem::Dependency