rsence 2.0.0.1.pre → 2.0.0.2.pre

data/VERSION

@@ -1 +1 @@
-2.0.0.1.pre
+2.0.0.2.pre

data/lib/conf/argv.rb

@@ -7,7 +7,7 @@
  #   with this software package. If not, contact licensing@riassence.com
  ##
  #++
-
+require 'daemon/sigcomm'
 module RSence
 def self.pid_support?
   # true for non-windows
@@ -27,8 +27,8 @@ end
 @@cmd_help = {}
 
 @@cmd_help[:head] = <<-EOF
-usage: rsence <command> [options] [args]
 RSence command-line tool, version #{@@version}
+
 EOF
 
 @@cmd_help[:unknown] = "Unknown command: "
@@ -36,6 +36,8 @@ EOF
 @@cmd_help[:help_help] = "Type 'rsence help' for usage."
 
 @@cmd_help[:help_main] = <<-EOF
+usage: rsence <command> [options] [args]
+
 Type 'rsence help <command>' for help on a specific command.
 
 Available commands:
@@ -200,16 +202,31 @@ Available options:
 
 EOF
 
+@@cmd_help[:save] = <<-EOF
+usage: 'rsence save [options] [PATH]'
+
+The 'save' command signals the RSence process to tell the plugins to save their
+data and the session manager to save its session database.
+
+Available options:
+
+  --conf <file.yaml>      Use additional config file. You can give this option
+                          several times. The <file.yaml> is the configuration
+                          file to load.
+  
+  --debug (-d)            Debug mode. Shortcut for several options useful for
+                          developers. Not the preferred mode for production.
+  
+  --verbose (-v)          More verbose output. Also enabled by --debug
+
+#{@@cmd_help[:path]}
+
+EOF
+
 @@cmd_help[:tail] = <<-EOF
 RSence is a self-contained rich internet application client-server framework.
 For further information, see http://rsence.org/
 EOF
-
-  def initialize( argv )
-    @argv = argv
-    @startable = false
-    parse_argv
-  end
   
   def startable?; @startable; end
   
@@ -527,24 +544,16 @@ EOF
     end
     require 'conf/default'
     config = Configuration.new(@args).config
-    # require 'daemon/daemon'
-    # puts "status: #{HTTPDaemon.daemonize.inspect}"
     port = config[:http_server][:port]
     addr = config[:http_server][:bind_address]
     port_status = test_port( port, addr )
-    # port_msg = port_status ? 'responds' : 'does not respond'
-    # puts "TCP status: #{addr}:#{port} #{port_msg}" if @args[:verbose]
     if RSence.pid_support?
       pid_fn = config[:daemon][:pid_fn]
       if File.exists?( pid_fn )
         pid = File.read( pid_fn ).to_i
-        begin
-          pid_status = Process.kill('USR2',pid)
-        rescue Errno::ESRCH
-          pid_status = false
-        end
-        # pid_msg = pid_status == false ? 'not running' : 'responds'
-        # puts "process id (#{pid}) #{pid_msg}" if @args[:verbose]
+        pid_status = RSence::SIGComm.wait_signal_response(
+          pid, pid_fn, 'USR2', 3
+        )
       else
         puts "no PID file, unable to check process status" if @args[:verbose]
         pid_status = nil
@@ -553,24 +562,109 @@ EOF
       puts "no PID support, unable to check process status" if @args[:verbose]
       pid_status = nil
     end
-    if port_status
-      puts "TCP response from #{addr} port #{port}"
-    else
-      puts "No TCP response from #{addr} port #{port}."
-    end
     if RSence.pid_support?
       if pid_status == nil
         puts "No process id, unable to check process status."
       elsif pid_status == false
-        puts "No process running."
+        puts "No process running#{port_status ? ' but something responds on ' : ' and nothing responds on ' }#{addr}:#{port}."
       else
-        puts "Process id #{pid} responded with signal #{pid_status}."
+        puts "Process id #{pid} is running#{port_status ? ' and responds on ' : ', but does not respond on '}#{addr}:#{port}."
       end
     end
   end
   
   def parse_save_argv
-    throw "parse_save_argv not implemented!"
+    init_args
+    expect_option  = false
+    option_name = false
+    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
+            puts "invalid #{option_nam.to_s}, expected number: #{arg.inspect}"
+            puts "Type 'rsence help #{@cmd.to_s}' for usage."
+            exit
+          elsif option_name == :conf_files
+            if not File.exists?( arg ) or not File.file?( arg )
+              puts "no such configuration file: #{arg.inspect}"
+              puts "Type 'rsence help #{@cmd.to_s}' for usage."
+              exit
+            else
+              @args[:conf_files].push( arg )
+            end
+          else
+            @args[option_name] = arg
+          end
+          expect_option = false
+        else
+          if arg.start_with?('--')
+            if arg == '--debug'
+              set_debug
+            elsif arg == '--verbose'
+              set_verbose
+            elsif arg == '--conf' or arg == '--config'
+              expect_option = true
+              option_name = :conf_files
+            else
+              invalid_option(arg)
+            end
+          elsif arg.start_with?('-')
+            arg.split('')[1..-1].each do |chr|
+              if chr == 'd'
+                set_debug
+              elsif chr == 'v'
+                set_verbose
+              else
+                invalid_option(arg,chr)
+              end
+            end
+          elsif valid_env?(arg)
+            @args[:env_path] = File.expand_path(arg)
+            @args[:conf_files].push( File.expand_path( File.join( arg, 'conf', 'config.yaml' ) ) )
+          else
+            invalid_env( arg )
+          end
+        end
+      end
+      if expect_option
+        puts "no value for option #{option_name.to_s.inspect}"
+        puts "Type 'rsence help #{@cmd.to_s} for usage."
+        exit
+      end
+    end
+    if valid_env?(@args[:env_path])
+      conf_file = File.expand_path( File.join( @args[:env_path], 'conf', 'config.yaml' ) )
+      @args[:conf_files].push( conf_file ) unless @args[:conf_files].include?( conf_file )
+    else
+      puts "invalid environment."
+      exit
+    end
+    require 'conf/default'
+    config = Configuration.new(@args).config
+    if RSence.pid_support?
+      pid_fn = config[:daemon][:pid_fn]
+      if File.exists?( pid_fn )
+        pid = File.read( pid_fn ).to_i
+        pid_status = RSence::SIGComm.wait_signal_response(
+          pid, pid_fn, 'USR1', 30, 'Saving session data...', '.', 0.1, true
+        )
+      else
+        puts "no PID file, unable to signal the save command to the process" if @args[:verbose]
+        pid_status = nil
+      end
+    else
+      puts "no PID support, unable to signal the save command to the process" if @args[:verbose]
+      pid_status = nil
+    end
+    if RSence.pid_support?
+      if pid_status == nil
+        puts "No process id, unable to signal the save command to the process."
+      elsif pid_status == false
+        puts "No process running."
+      else
+        puts "Session data saved."
+      end
+    end
   end
   
   def parse_setup_argv
@@ -581,6 +675,29 @@ EOF
     throw "parse_initenv_argv not implemented!"
   end
   
+  def help( cmd )
+    cmd.to_sym! if cmd.class != Symbol
+    puts @@cmd_help[:head]
+    if @@cmd_help.has_key?(cmd)
+      puts @@cmd_help[cmd]
+    else
+      puts @@cmd_help[:help_main]
+    end
+    puts @@cmd_help[:tail]
+  end
+  
+  def version
+    @@version
+  end
+  
+  def cmd
+    @cmd
+  end
+  
+  def args
+    @args
+  end
+  
   def parse_argv
     if @argv.empty?
       puts @@cmd_help[:help_help]
@@ -614,37 +731,23 @@ EOF
     end
   end
   
-  def help( cmd )
-    cmd.to_sym! if cmd.class != Symbol
-    puts @@cmd_help[:head]
-    if @@cmd_help.has_key?(cmd)
-      puts @@cmd_help[cmd]
-    else
-      puts @@cmd_help[:help_main]
-    end
-    puts @@cmd_help[:tail]
-  end
-  
-  def version
-    puts @@version
-  end
-  
-  def cmd
-    @cmd
+  def parse( argv )
+    @argv = argv
+    @startable = false
+    parse_argv
   end
   
-  def args
-    @args
+  def initialize
+    @startable = false
   end
   
 end
 
-@@argv_parser = ARGVParser.new( ARGV )
-
 def self.argv;    @@argv_parser;    end
 def self.cmd;     @@argv_parser.cmd;     end
 def self.args;    @@argv_parser.args;    end
 def self.startable?; @@argv_parser.startable?; end
+def self.version; @@argv_parser.version; end
 def self.startup
   puts "Loading configuration..." if self.args[:verbose]
   # Use the default configuration:
@@ -659,6 +762,8 @@ def self.startup
   daemon = HTTPDaemon.new
   daemon.daemonize!
 end
+@@argv_parser = ARGVParser.new
+@@argv_parser.parse( ARGV )
 
 end
 

data/lib/daemon/daemon.rb

@@ -34,9 +34,6 @@ RSence.config[:http_server][:rack_handler] = self.method({
   'rainbows' => :rack_rainbows_handler
 }[RSence.config[:http_server][:rack_require]]).call
 
-# Debug mode switch. The debug mode is intended for developers, not production.
-$DEBUG_MODE  = RSence.config[:debug_mode]
-
 # Transporter is the top-level handler for calls coming from the javascript COMM.Transporter.
 require 'transporter/transporter'
 
@@ -92,53 +89,21 @@ module Daemon
   end
   
   def self.write_signal_response( daemon, signal )
-    sig_fn = daemon.pid_fn+'.response.'+signal
-    File.open(sig_fn,'w') do |file|
-      file.write(Process.pid.to_s)
-    end
+    pid = Process.pid.to_s
+    pid_fn = daemon.pid_fn
+    RSence::SIGComm.write_signal_response( pid, pid_fn, signal )
   end
   
   def self.delete_signal_response( daemon, signal )
-    sig_fn = daemon.pid_fn+'.response.'+signal
-    if File.file?( sig_fn )
-      File.delete( sig_fn )
-    end
+    pid_fn = daemon.pid_fn
+    RSence::SIGComm.delete_signal_response( pid_fn )
   end
   
   def self.wait_signal_response( daemon, signal, timeout = 10,
-                                 debug_pre = '<', debug_suf = '>', sleep_secs = 0.2 )
-    begin
-      if RSence.args[:verbose]
-        print debug_pre
-        STDOUT.flush
-      end
-      pid = read_pid( daemon )
-      sig_fn = daemon.pid_fn+'.response.'+signal
-      File.delete( sig_fn ) if File.file?( sig_fn )
-      status = Process.kill( signal, pid )
-      time_out = Time.now + timeout
-      until time_out > Time.now or File.file?( sig_fn )
-        if RSence.args[:verbose]
-          print "."
-          STDOUT.flush
-        end
-        sleep sleep_secs
-      end
-      sleep sleep_secs
-      if File.file?( sig_fn )
-        sig_pid = File.read( sig_fn ).to_i
-        if sig_pid != pid
-          puts "Warning, signal PID mismatch. Expected #{pid}, got #{sig_pid}"
-        end
-        File.delete( sig_fn )
-      else
-        puts "Warning, signal response file disappeared! Expected #{sig_fn}"
-      end
-      puts debug_suf if RSence.args[:verbose]
-      return true
-    rescue Errno::ESRCH
-      return false
-    end
+                                 debug_pre = false, debug_suf = false, sleep_secs = 0.2 )
+    pid = read_pid( daemon )
+    pid_fn = daemon.pid_fn
+    return RSence::SIGComm.wait_signal_response( pid, pid_fn, signal, timeout, debug_pre, debug_suf, sleep_secs )
   end
   
   # Traps common kill signals
@@ -158,20 +123,30 @@ module Daemon
         puts "RSence killed with signal #{signal.inspect}" if RSence.args[:verbose]
         daemon.usr1
         daemon.stop
-        # delete_signal_response( daemon, 'USR1' )
-        # delete_signal_response( daemon, 'USR2' )
-        File.delete( daemon.pid_fn ) if File.file?( daemon.pid_fn )
+        delete_stale_pids( daemon )
         write_signal_response( daemon, signal )
         puts "Shutdown complete."
         exit
       end
     end
-    # Signal.trap('HUP') do
-    #   daemon.restart
-    # end
+    Signal.trap('HUP') do
+      daemon.stop
+      daemon.start
+    end
+  end
+  
+  def self.delete_stale_pids( daemon )
+    ( pid_fn_path, pid_fn_name ) = File.split( daemon.pid_fn )
+    Dir.entries( pid_fn_path ).each do | item_fn |
+      item_path = File.join( pid_fn_path, item_fn )
+      if item_fn.start_with?( pid_fn_name ) and File.file?( item_path )
+        puts "Stale pid file (#{item_fn}), removing.." if RSence.args[:verbose]
+        File.delete( item_path )
+      end
+    end
   end
   
-  def self.handle_pid( daemon )
+  def self.init_pid( daemon )
     if RSence.pid_support?
       is_running = status( daemon )
       if is_running
@@ -181,9 +156,8 @@ module Daemon
           Process.kill( 'INT', RSence.launch_pid )
         end
         exit
-      elsif not is_running and File.file?( daemon.pid_fn )
-        puts "Stale pid file, removing.."
-        File.delete( daemon.pid_fn )
+      elsif not is_running
+        delete_stale_pids( daemon )
       end
       trap_signals( daemon )
       pid = Process.pid
@@ -195,7 +169,7 @@ module Daemon
   end
   
   def self.run( daemon )
-    handle_pid( daemon )
+    init_pid( daemon )
     daemon.run
     exit
   end
@@ -203,7 +177,7 @@ module Daemon
   def self.start( daemon )
     fork do
       exit if fork
-      handle_pid( daemon )
+      init_pid( daemon )
       daemon.start
     end
     Signal.trap('INT') do
@@ -248,7 +222,7 @@ module Daemon
         puts "RSence might still be running, please ensure manually."
       end
     elsif status_ == false
-      puts "Warning, no such process (#{pid}) running."
+      puts "Warning, no such process (#{read_pid(daemon)}) running."
     elsif status_ == nil
       puts "Warning, no pid file (process not running)."
     else
@@ -366,7 +340,7 @@ class HTTPDaemon
   
   # Called on USR2 signals ("Alive?")
   def usr2
-    puts "Alive."
+    puts "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} -- RSence version #{RSence.version} is running."
   end
   
   # Main entry point, daemonizes itself using Controller.

data/lib/daemon/sigcomm.rb

@@ -0,0 +1,64 @@
+#--
+##   Riassence Framework
+ #   Copyright 2010 Riassence Inc.
+ #   http://riassence.com/
+ #
+ #   You should have received a copy of the GNU General Public License along
+ #   with this software package. If not, contact licensing@riassence.com
+ ##
+ #++
+
+# RSence async signal communication handler, uses temporary files for communication.
+# Utilized by ARGVParser and Daemon.
+
+module RSence
+  module SIGComm
+    def self.delete_signal_response( pid_fn )
+      sig_fn = pid_fn+'.response.'+signal
+      if File.file?( sig_fn )
+        File.delete( sig_fn )
+      end
+    end
+    def self.write_signal_response( pid, pid_fn, signal )
+      sig_fn = pid_fn+'.response.'+signal
+      File.open(sig_fn,'w') do |file|
+        file.write( pid.to_s )
+      end
+    end
+    def self.wait_signal_response( pid, pid_fn, signal, timeout = 10,
+                                   debug_pre = false, debug_suf = false,
+                                   sleep_secs = 0.2, verbose=nil )
+      sig_fn = pid_fn+'.response.'+signal
+      verbose = RSence.args[:verbose] if verbose == nil
+      begin
+        if verbose and debug_pre
+          print debug_pre
+        end
+        File.delete( sig_fn ) if File.exists?( sig_fn )
+        status = Process.kill( signal, pid )
+        time_out = Time.now + timeout
+        until (time_out < Time.now) or File.exists?( sig_fn )
+          if verbose
+            print "."
+            STDOUT.flush
+          end
+          sleep sleep_secs
+        end
+        if File.file?( sig_fn )
+          sig_pid = File.read( sig_fn ).to_i
+          if sig_pid != pid
+            puts "Warning, signal PID mismatch. Expected #{pid}, got #{sig_pid}"
+          end
+          File.delete( sig_fn )
+        else
+          puts "Warning, signal response file disappeared! Expected #{sig_fn}"
+        end
+        puts debug_suf if verbose and debug_suf
+        return true
+      rescue Errno::ESRCH
+        return false
+      end
+    end
+  end
+end
+

data/lib/http/broker.rb

@@ -66,7 +66,7 @@ class Broker
   end
   
   def not_found
-    puts "/404: #{@request.fullpath.inspect}" if $DEBUG_MODE
+    puts "/404: #{@request.fullpath.inspect}" if RSence.args[:verbose]
     @response.status = 404
     err404 = '<html><head><title>404 - Page Not Found</title></head><body>404 - Page Not Found</body></html>'
     @response['content-type'] = 'text/html; charset=UTF-8'
@@ -77,7 +77,7 @@ class Broker
   ## Post requests are always xhr requests
   def post
     
-    puts "post: #{@request.fullpath}" if $DEBUG_MODE
+    puts "post: #{@request.fullpath}" if RSence.args[:verbose]
     
     sleep @@ping_sim if @@ping_sim
     
@@ -88,7 +88,7 @@ class Broker
   ## Get requests are different, depending on the uri requested
   def get
     
-    puts "get: #{@request.fullpath}" if $DEBUG_MODE
+    puts "get: #{@request.fullpath}" if RSence.args[:verbose]
     
     sleep @@ping_sim if @@ping_sim
     

data/lib/session/sessionmanager.rb

@@ -362,7 +362,7 @@ class SessionManager < SessionStorage
     end
     
     if domain == 'localhost'
-      # warn "Warning: Cookies won't be set for 'localhost'. Use '127.0.0.1' instead." if $DEBUG_MODE
+      warn "Warning: Cookies won't be set for 'localhost'. Use '127.0.0.1' instead." if RSence.args[:debug]
       return
     end
     

data/lib/session/sessionstorage.rb

@@ -101,7 +101,7 @@ class SessionStorage
   def create_session_table
     db_open
     unless @db.table_exists?(:rsence_session)
-      puts "Creating session table..." if $DEBUG_MODE
+      puts "Creating session table..." if RSence.args[:verbose]
       @db.create_table :rsence_session do
         primary_key( :id )
         column( :cookie_key,  String  )
@@ -121,7 +121,7 @@ class SessionStorage
   def create_version_table
     db_open
     unless @db.table_exists?(:rsence_version)
-      puts "Creating version info table..." if $DEBUG_MODE
+      puts "Creating version info table..." if RSence.args[:verbose]
       @db.create_table :rsence_version do
         Integer :version
       end
@@ -135,7 +135,7 @@ class SessionStorage
   def create_uploads_table
     db_open
     unless @db.table_exists?(:rsence_uploads)
-      puts "Creating uploads table..." if $DEBUG_MODE
+      puts "Creating uploads table..." if RSence.args[:verbose]
       @db.create_table :rsence_uploads do
         primary_key( :id )
         foreign_key( :ses_id, :rsence_session )
@@ -189,7 +189,7 @@ class SessionStorage
   
   ## Restores all saved sessions from db to ram
   def restore_sessions
-    puts "Restoring sessions..." if $DEBUG_MODE
+    puts "Restoring sessions..." if RSence.args[:verbose]
     db_open
     @db[:rsence_session].all do |ses_row|
       ses_id = ses_row[:id]
@@ -211,7 +211,7 @@ class SessionStorage
   
   ## Stores all sessions to db from ram
   def store_sessions
-    puts "Storing sessions..." if $DEBUG_MODE
+    puts "Storing sessions..." if RSence.args[:verbose]
     db_open
     @sessions.each_key do |ses_id|
       ses_data = @sessions[ ses_id ]
@@ -233,9 +233,9 @@ class SessionStorage
   ## Shut-down signal, triggers store_sessions for now
   def shutdown
     @accept_requests = false
-    puts "Session shutdown in progress..." if $DEBUG_MODE
+    puts "Session shutdown in progress..." if RSence.args[:verbose]
     store_sessions
-    puts "Session shutdown complete." if $DEBUG_MODE
+    puts "Session shutdown complete." if RSence.args[:verbose]
   end
   
   

data/lib/transporter/transporter.rb

@@ -33,7 +33,7 @@ class Transporter
     
     @valuemanager = ValueManager.new
     @sessions = SessionManager.new( self )
-    @plugins = PluginManager.new( ::RSence.config[:plugin_paths], self, $DEBUG_MODE )
+    @plugins = PluginManager.new( ::RSence.config[:plugin_paths], self, RSence.args[:autoreload] )
     if RSence.launch_pid != Process.pid
       Process.kill( 'TERM', RSence.launch_pid )
     end
@@ -42,25 +42,6 @@ class Transporter
   def servlet( request_type, request, response )
     broker_urls = ::RSence.config[:broker_urls]
     uri = request.fullpath
-    # if $DEBUG_MODE and uri == $config[:index_html][:respond_address] and request_type == :get
-    #   unless ARGV.include?('-no-rescan') or ARGV.include?('--no-rescan')
-    #     puts "Reloading plugins."
-    #     if RSence.args[:say]
-    #       Thread.new do
-    #         Thread.pass
-    #         system('say "Reloading plugins."')
-    #       end
-    #     end
-    #     @plugins.rescan
-    #     puts "Plugins reloaded."
-    #     if RSence.args[:say]
-    #       Thread.new do
-    #         Thread.pass
-    #         system('say "Plugins reloaded."')
-    #       end
-    #     end
-    #   end
-    # end
     
     if request_type == :post
       ## /x handles xhr without cookies
@@ -74,10 +55,6 @@ class Transporter
       else
         session = {}
         return @plugins.match_servlet( request_type, request, response, session )
-      ## /SOAP handles SOAP Requests
-      # elsif uri == broker_urls[:soap]
-      #   soap( request, response )
-      #   return true
       end
     else
       session = {}
@@ -85,11 +62,6 @@ class Transporter
     end
   end
   
-  ## handles incoming SOAP requests
-  # def soap(request, response)
-  #   PluginManager.soap( request, response )
-  # end
-  
   # wrapper for the session manager stop client functionality
   def xhr_error_handler(msg,err_name,err_extra_descr='')
     @sessions.stop_client_with_message( msg,
@@ -101,9 +73,9 @@ class Transporter
   
   # wrapper for tracebacks in xhr
   def xhr_traceback_handler(e,err_descr='Transporter::UnspecifiedError')
-    puts "=="*40 if $DEBUG_MODE
+    puts "=="*40 if RSence.args[:debug]
     puts err_descr
-    if $DEBUG_MODE
+    if RSence.args[:debug]
       puts "--"*40
       puts e.message
       puts "  #{e.backtrace.join("\n  ")}"
@@ -131,7 +103,7 @@ class Transporter
     if request.query.has_key?('err_msg')
       response_success = false
       client_error_msg = request.query['err_msg'].inspect
-      puts "\nCLIENT ERROR:\n#{client_error_msg}\n" if $DEBUG_MODE
+      puts "\nCLIENT ERROR:\n#{client_error_msg}\n" if RSence.args[:debug]
       xhr_error_handler(msg,:client_error,client_error_msg)
     end
     
@@ -144,11 +116,11 @@ class Transporter
         msg.reply("COMM.Transporter.url=#{::RSence.config[:broker_urls][:x].to_json};")
       end
       
-      # Appends a 'new session.' message for new sessions in $DEBUG_MODE:
-      puts "new session." if msg.new_session and $DEBUG_MODE
-      puts "restored session." if msg.restored_session and $DEBUG_MODE
-      puts "clone source." if msg.cloned_targets and $DEBUG_MODE
-      puts "clone target." if msg.cloned_source and $DEBUG_MODE
+      # Appends a 'new session.' message for new sessions in RSence.args[:verbose]:
+      puts "new session." if msg.new_session and RSence.args[:verbose]
+      puts "restored session." if msg.restored_session and RSence.args[:verbose]
+      puts "clone source." if msg.cloned_targets and RSence.args[:verbose]
+      puts "clone target." if msg.cloned_source and RSence.args[:verbose]
       
       ## Pass the client XML to the value manager
       if request.query.has_key?( 'values' )

data/plugins/client_pkg/client_pkg.rb

@@ -99,7 +99,7 @@ class ClientPkg < Servlet
   end
   
   def open
-    if not @thr and $DEBUG_MODE
+    if not @thr and RSence.args[:autoupdate]
       @thr = Thread.new do
         Thread.pass
         while true

data/plugins/client_pkg/lib/client_pkg_build.rb

@@ -320,8 +320,6 @@ class ClientPkgBuild
     minimize_data
     build_themes
     
-    #save_file( File.join( @js_dst_dir, 'built' ), Time.now.to_i.to_s )
-    
   end
   
   def setup_dirs
@@ -498,8 +496,8 @@ class ClientPkgBuild
     @no_obfuscation = config[:no_obfuscation]
     @no_whitespace_removal = config[:no_whitespace_removal]
     @js_inc = config[:js_inc]
-    @debug = (not $DEBUG_MODE)
-    @quiet = (not $DEBUG_MODE)
+    @debug = (not RSence.args[:debug])
+    @quiet = (not RSence.args[:verbose])
   end
   
   def find_newer( src_dir, newer_than )
@@ -529,19 +527,6 @@ class ClientPkgBuild
    return false
   end
   
-  ##def autorun
-  ##  while true
-  ##    newest = read_file( File.join( @js_dst_dir, 'built' ) ).to_i
-  ##    @logger.log( "waiting for changes..." )
-  ##    until bundle_changes( newest )
-  ##      sleep 3
-  ##    end
-  ##    flush
-  ##    run
-  ##    `say "Autobuild complete!"` if RSence.args[:say]
-  ##  end
-  ##end
-  
   def print_stat( package_name, dst_size, jsc_size, gz_size )
     percent = 'n/a'
     if dst_size > 0

data/plugins/client_pkg/lib/client_pkg_serve.rb

@@ -154,14 +154,14 @@ module ClientPkgServe
       if not has_theme
         response.status = 404
         response.body   = '404 - Theme Not Found'
-        puts "Theme #{theme_name} not found, avail: #{@client_cache.theme_cache.keys.join(', ')}" if $DEBUG_MODE
+        puts "Theme #{theme_name} not found, avail: #{@client_cache.theme_cache.keys.join(', ')}" if RSence.args[:verbose]
       elsif not has_theme_part
         response.status = 503
         response.body   = '503 - Invalid Theme Part Request'
       elsif not has_theme_file
         response.status = 404
         response.body   = '404 - Theme Resource Not Found'
-        puts "File not found, avail: #{@client_cache.theme_cache[theme_name][theme_part].keys.join(', ')}" if $DEBUG_MODE
+        puts "File not found, avail: #{@client_cache.theme_cache[theme_name][theme_part].keys.join(', ')}" if RSence.args[:verbose]
       else
         
         response.status = 200

data/plugins/main/main.rb

@@ -154,7 +154,7 @@ class Main < Plugin
     until time_taken > 0.2 or ses[:delayed_calls].size == 0 or call_count == 0
       # gets the next call
       delayed_call = ses[:delayed_calls].shift
-      if $DEBUG_MODE
+      if RSence.args[:debug]
         puts "delayed_call: #{delayed_call.inspect}"
       end
       # strings are always javascript, used for segmenting client load

data/plugins/ticketservices/lib/common.rb

@@ -43,7 +43,7 @@ module Common
       
       # checks, that the format is a supported image type
       unless @content_types.keys.include?( format )
-        puts "ImgServe.serve: invalid format (#{format.inspect})" if $DEBUG_MODE
+        puts "ImgServe.serve: invalid format (#{format.inspect})" if RSence.args[:verbose]
         return File.join(::RSence.config[:broker_urls][:i],'invalid.gif')
       end
       
@@ -150,18 +150,18 @@ module Common
       img_id = req.unparsed_uri.match(/^#{::RSence.config[:broker_urls][:i]}(.*)$/)[1]
       
       if img_id == nil
-        puts "ImgServe.fetch_img: invalid uri#1 (#{req.unparsed_uri.inspect})" if $DEBUG_MODE
+        puts "ImgServe.fetch_img: invalid uri#1 (#{req.unparsed_uri.inspect})" if RSence.args[:verbose]
         img_id = 'invalid.gif'
       end
       
       img_id = img_id.split('.')[0]
       
       if img_id == nil
-        puts "ImgServe.fetch_img: invalid uri#2 (#{req.unparsed_uri.inspect})" if $DEBUG_MODE
+        puts "ImgServe.fetch_img: invalid uri#2 (#{req.unparsed_uri.inspect})" if RSence.args[:verbose]
         img_id = 'invalid.gif'
       
       elsif img_id.size != 84
-        puts "ImgServe.fetch_img: invalid img_id (#{img_id.inspect})" if $DEBUG_MODE
+        puts "ImgServe.fetch_img: invalid img_id (#{img_id.inspect})" if RSence.args[:verbose]
         img_id = 'invalid.gif'
       end
       
@@ -200,15 +200,15 @@ module Common
     elsif type == :file
       file_id = req.unparsed_uri.match(/^#{::RSence.config[:broker_urls][:f]}(.*)$/)[1]
       if file_id == nil
-        puts "fileServe.fetch_file: invalid uri#1 (#{req.unparsed_uri.inspect})" if $DEBUG_MODE
+        puts "fileServe.fetch_file: invalid uri#1 (#{req.unparsed_uri.inspect})" if RSence.args[:verbose]
         file_id = 'invalid.gif'
       end
       file_id = file_id.split('.')[0]
       if file_id == nil
-        puts "fileServe.fetch_file: invalid uri#2 (#{req.unparsed_uri.inspect})" if $DEBUG_MODE
+        puts "fileServe.fetch_file: invalid uri#2 (#{req.unparsed_uri.inspect})" if RSence.args[:verbose]
         file_id = 'invalid.gif'
       elsif file_id.size != 84
-        puts "fileServe.fetch_file: invalid file_id (#{file_id.inspect})" if $DEBUG_MODE
+        puts "fileServe.fetch_file: invalid file_id (#{file_id.inspect})" if RSence.args[:verbose]
         file_id = 'invalid.gif'
       end
       if @raw_uris.include?(file_id)
@@ -231,14 +231,14 @@ module Common
     elsif type == :blobobj
       blobobj_id = req.unparsed_uri.match(/^#{::RSence.config[:broker_urls][:b]}(.*)$/)[1]
       if blobobj_id == nil
-        puts "fileServe.fetch_blobobj: invalid uri#1 (#{req.unparsed_uri.inspect})" if $DEBUG_MODE
+        puts "fileServe.fetch_blobobj: invalid uri#1 (#{req.unparsed_uri.inspect})" if RSence.args[:verbose]
         blobobj_id = 'invalid.gif'
       end
       if blobobj_id == nil
-        puts "fileServe.fetch_blobobj: invalid uri#2 (#{req.unparsed_uri.inspect})" if $DEBUG_MODE
+        puts "fileServe.fetch_blobobj: invalid uri#2 (#{req.unparsed_uri.inspect})" if RSence.args[:verbose]
         blobobj_id = 'invalid.gif'
       elsif blobobj_id.size != 84
-        puts "fileServe.fetch_blobobj: invalid blobobj_id (#{blobobj_id.inspect})" if $DEBUG_MODE
+        puts "fileServe.fetch_blobobj: invalid blobobj_id (#{blobobj_id.inspect})" if RSence.args[:verbose]
         blobobj_id = 'invalid.gif'
       end
       if @raw_uris.include?(blobobj_id)
@@ -266,15 +266,15 @@ module Common
     elsif type == :rsrc
       rsrc_id = req.unparsed_uri.match(/^#{::RSence.config[:broker_urls][:d]}(.*)$/)[1]
       if rsrc_id == nil
-        puts "rsrcServe.fetch_rsrc: invalid uri#1 (#{req.unparsed_uri.inspect})" if $DEBUG_MODE
+        puts "rsrcServe.fetch_rsrc: invalid uri#1 (#{req.unparsed_uri.inspect})" if RSence.args[:verbose]
         rsrc_id = 'invalid.gif'
       end
       rsrc_id = rsrc_id.split('.')[0]
       if rsrc_id == nil
-        puts "rsrcServe.fetch_rsrc: invalid uri#2 (#{req.unparsed_uri.inspect})" if $DEBUG_MODE
+        puts "rsrcServe.fetch_rsrc: invalid uri#2 (#{req.unparsed_uri.inspect})" if RSence.args[:verbose]
         rsrc_id = 'invalid.gif'
       elsif rsrc_id.size != 84
-        puts "rsrcServe.fetch_rsrc: invalid rsrc_id (#{rsrc_id.inspect})" if $DEBUG_MODE
+        puts "rsrcServe.fetch_rsrc: invalid rsrc_id (#{rsrc_id.inspect})" if RSence.args[:verbose]
         rsrc_id = 'invalid.gif'
       end
       if @raw_uris.include?(rsrc_id)

data/plugins/ticketservices/ticketservices.rb

@@ -83,21 +83,21 @@ class TicketServe < Servlet
   def get( req, res, ses )
     uri = req.fullpath
     if uri.match( /^#{broker_urls[:i]}/ )
-      # puts "/i: #{uri.inspect}" if $DEBUG_MODE
+      puts "/i: #{uri.inspect}" if RSence.args[:verbose]
       get_ticket( req, res, :img )
     elsif uri.match( /^#{broker_urls[:d]}/ )
-      # puts "/d: #{uri.inspect}" if $DEBUG_MODE
+      puts "/d: #{uri.inspect}" if RSence.args[:verbose]
       get_ticket( req, res, :rsrc )
     elsif uri.match( /^#{broker_urls[:f]}/ )
-      # puts "/f: #{uri.inspect}" if $DEBUG_MODE
+      puts "/f: #{uri.inspect}" if RSence.args[:verbose]
       get_ticket( req, res, :file )
     elsif uri.match( /^#{broker_urls[:b]}/ )
-      # puts "/b: #{uri.inspect}" if $DEBUG_MODE
+      puts "/b: #{uri.inspect}" if RSence.args[:verbose]
       get_ticket( req, res, :blobobj )
     elsif uri == broker_urls[:favicon]
       favicon( req, res )
     elsif uri == broker_urls[:uploader_iframe]
-      # puts "/U/iframe_html: #{uri.inspect}" if $DEBUG_MODE
+      puts "/U/iframe_html: #{uri.inspect}" if RSence.args[:verbose]
       res.status = 200
       http_body = '<html><head><title>Empty Iframe for Uploading</title></head><body></body></html>'
       res['content-type'] = 'text/html; charset=UTF-8'
@@ -109,7 +109,7 @@ class TicketServe < Servlet
   def post( req, res, ses )
     uri = req.fullpath
     if uri[0..2] == broker_urls[:u]
-      puts "/U: #{uri.inspect}" if $DEBUG_MODE
+      puts "/U: #{uri.inspect}" if RSence.args[:verbose]
       upload( req, res )
     end
   end

metadata

@@ -6,9 +6,9 @@ version: !ruby/object:Gem::Version
   - 2
   - 0
   - 0
-  - 1
+  - 2
   - pre
-  version: 2.0.0.1.pre
+  version: 2.0.0.2.pre
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -47,6 +47,7 @@ files:
 - lib/conf/default.rb
 - lib/conf/wizard.rb
 - lib/daemon/daemon.rb
+- lib/daemon/sigcomm.rb
 - lib/http/broker.rb
 - lib/http/rackup.rb
 - lib/http/request.rb