rsence 2.0.0.3.pre → 2.0.0.4.pre

data/lib/conf/default.rb

@@ -68,7 +68,7 @@ class Configuration
     wizard_config_data = ConfigWizard.new(config).run( wizard_conf_file )
     config.merge!( wizard_config_data )
   end
-  def initialize(args)
+  def initialize( args, dont_expand_path=false )
     ## Paths for log and pid files
     pidpath = File.join( args[:env_path], 'run' )
     logpath = File.join( args[:env_path], 'log' )
@@ -138,10 +138,11 @@ class Configuration
       end
     end
     
-    env_plugins_path = File.join( args[:env_path], 'plugins' )
+    env_plugins_path = File.expand_path( 'plugins', args[:env_path] )
     unless config[:plugin_paths].include? env_plugins_path
       config[:plugin_paths].push( env_plugins_path )
     end
+    puts "plugin paths: #{config[:plugin_paths].inspect}" if args[:debug]
     
     config[:trace] = true if args[:trace_js]
     config[:debug_mode] = true if args[:debug]
@@ -154,12 +155,9 @@ class Configuration
     config[:daemon][:pid_fn] = File.join(pidpath, "rsence.pid") unless config[:daemon].has_key?(:pid_fn)
     config[:daemon][:log_fn] = File.join(logpath, "rsence") unless config[:daemon].has_key?(:log_fn)
     
-    if config[:database][:ses_db].start_with?('sqlite://')
-      db_url = config[:database][:ses_db].split('sqlite://')[1]
-      unless db_url.start_with?('/')
-        db_url = File.join( args[:env_path], db_url )
-        config[:database][:ses_db] = "sqlite://#{db_url}"
-      end
+    if config[:database][:ses_db].start_with?('sqlite://') and not dont_expand_path
+      db_url = File.expand_path( config[:database][:ses_db].split('sqlite://')[1], args[:env_path] )
+      config[:database][:ses_db] = "sqlite://#{db_url}"
     end
     
     ## Broker configuration

data/lib/daemon/daemon.rb

@@ -106,6 +106,18 @@ module Daemon
     return RSence::SIGComm.wait_signal_response( pid, pid_fn, signal, timeout, debug_pre, debug_suf, sleep_secs )
   end
   
+  def self.trap_windows_signals( daemon )
+    ['INT'].each do | signal |
+      Signal.trap( signal ) do
+        puts "RSence killed with signal #{signal.inspect}" if RSence.args[:verbose]
+        daemon.usr1
+        daemon.stop
+        puts "Shutdown complete."
+        exit
+      end
+    end
+  end
+  
   # Traps common kill signals
   def self.trap_signals( daemon )
     
@@ -164,6 +176,7 @@ module Daemon
       write_pid( daemon, pid ) 
       return pid
     else
+      trap_windows_signals( daemon )
       return false
     end
   end
@@ -321,8 +334,7 @@ class HTTPDaemon
   
   # Called by Controller#stop, contains RSence-specific operations
   def stop
-    @transporter.plugins.shutdown
-    @transporter.sessions.shutdown
+    @transporter.shutdown
   end
   
   # Called on USR1 signals (save data)
@@ -332,10 +344,13 @@ class HTTPDaemon
   
   # Save state
   def save
-    puts "Saving."
+    puts "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} -- Saving state..."
+    transporter_state = @transporter.online?
+    @transporter.online = false
     @transporter.plugins.delegate(:flush)
     @transporter.sessions.store_sessions
-    puts "Saved."
+    @transporter.online = transporter_state
+    puts "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} -- State saved."
   end
   
   # Called on USR2 signals ("Alive?")

data/lib/http/broker.rb

@@ -30,6 +30,17 @@ require 'http/request'
 class Broker
   
   def call(env)
+    sleep @@ping_sim if @@ping_sim
+    unless @@transporter.online?
+      puts "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} -- Server busy."
+      headers = {
+        'Retry-After' => '2',
+        'Content-Type' => 'text/plain',
+        'Refresh' => "2; #{env['REQUEST_URI']}",
+        'Content-Length' => '4'
+      }
+      return [ 503, headers, 'BUSY' ]
+    end
     request  = Request.new(env)
     response = Response.new
     request_method = request.request_method.downcase
@@ -58,6 +69,13 @@ class Broker
     else
       @@ping_sim = conf/1000.0
     end
+    Thread.new do
+      Thread.pass
+      until RSence.argv.test_port( port, host )
+        sleep 0.1
+      end
+      @@transporter.online = true
+    end
     handler.run( Rack::Lint.new(self.new), :Host => host, :Port => port )
   end
   
@@ -79,8 +97,6 @@ class Broker
     
     puts "post: #{@request.fullpath}" if RSence.args[:verbose]
     
-    sleep @@ping_sim if @@ping_sim
-    
     not_found unless @@transporter.servlet( :post, @request, @response )
     
   end
@@ -90,8 +106,6 @@ class Broker
     
     puts "get: #{@request.fullpath}" if RSence.args[:verbose]
     
-    sleep @@ping_sim if @@ping_sim
-    
     not_found unless @@transporter.servlet( :get, @request, @response )
     
   end

data/lib/plugins/plugin_util.rb

@@ -79,9 +79,7 @@ module PluginUtil
     if prefix
       path = File.join( prefix, path )
     end
-    if path[0].chr != '/' and path[0..1] != '..'
-      path = File.join( @path, path )
-    end
+    path = File.expand_path( path, @path )
     return path
   end
   

data/lib/plugins/pluginmanager.rb

@@ -121,7 +121,10 @@ class PluginManager
         if File.exists?( File.join( bundle_path, 'disabled' ) )
           if @registry.has_key?( bundle_name.to_sym )
             puts "Disabling bundle #{bundle_name}..."
+            online_status = @transporter.online?
+            @transporter.online = false
             unload_bundle( bundle_name.to_sym )
+            @transporter.online = online_status
             if RSence.args[:say]
               Thread.new do
                 Thread.pass
@@ -132,8 +135,11 @@ class PluginManager
         else
           if not @registry.has_key?( bundle_name.to_sym )
             puts "Loading bundle #{bundle_name}..."
+            online_status = @transporter.online?
+            @transporter.online = false
             load_bundle( bundle_path, bundle_name.to_sym, bundle_name+'.rb' )
             call( bundle_name.to_sym, :open )
+            @transporter.online = online_status
             if RSence.args[:say]
               Thread.new do
                 Thread.pass
@@ -145,9 +151,12 @@ class PluginManager
             info = @info[bundle_name.to_sym]
             if info[:reloadable] and plugin_changed?( bundle_name.to_sym )
               puts "Bundle #{bundle_name} has changed, reloading..."
+              online_status = @transporter.online?
+              @transporter.online = false
               unload_bundle( bundle_name.to_sym )
               load_bundle( bundle_path, bundle_name.to_sym, bundle_name+'.rb' )
               call( bundle_name.to_sym, :open )
+              @transporter.online = online_status
               if RSence.args[:say]
                 Thread.new do
                   Thread.pass
@@ -162,6 +171,7 @@ class PluginManager
   end
   
   def unload_bundle( bundle_name )
+    puts "unloading bundle: #{bundle_name.inspect}" if RSence.args[:debug]
     if @registry.has_key?( bundle_name )
       call( bundle_name, :flush )
       call( bundle_name, :close )
@@ -194,11 +204,6 @@ class PluginManager
     @info     = {}
     @aliases  = {}
     @servlets = []
-    # @types    = {
-    #   :gui     => [],
-    #   :plugin  => [],
-    #   :servlet => []
-    # }
     @plugin_paths.each do |path|
       next unless File.directory? path
       scan_plugindir( path )
@@ -219,10 +224,8 @@ class PluginManager
   #  - Skips bundles containing a file or directory named 'disabled'
   def scan_plugindir( path )
     Dir.entries(path).each do |bundle_name|
-      # puts "bundle_name: #{bundle_name}"
       next if bundle_name[0].chr == '.'
       bundle_path = File.expand_path( File.join( path, bundle_name ) )
-      # puts "#{File.stat(bundle_path).inspect}"
       next unless File.directory?( bundle_path )
       bundle_file = bundle_name+'.rb'
       if not File.exists?( File.join( bundle_path, bundle_file ) )
@@ -306,7 +309,7 @@ class PluginManager
   
   # Loads a plugin bundle.
   def load_bundle( bundle_path, bundle_name, bundle_file )
-    
+    puts "loading bundle: #{bundle_name.inspect}" if RSence.args[:debug]
     if @registry.has_key?( bundle_name.to_sym )
       warn "Warning: Bundle #{bundle_name} already loaded."
       return
@@ -331,10 +334,6 @@ class PluginManager
         @@bundle_info    = bundle_info
         @@plugin_manager = plugin_manager
         def m.bundle_path; @@bundle_path; end
-        # puts "using eval"
-        # m::module_eval( File.read(src_path) )
-        # puts "using require"
-        # require src_path[0..-4]
         puts "using load"
         load src_path
       end
@@ -350,18 +349,14 @@ class PluginManager
     end
     
     unless bundle_info[:inits_self]
-      # puts "#{bundle_name}: #{module_ns.constants.inspect}"
       module_ns.constants.each do |module_const_name|
         module_const = module_ns.const_get( module_const_name )
         if module_const.class == Class
-          # puts "is class"
           module_const.ancestors.each do |ancestor|
-            # puts "ancestor: #{ancestor.to_s.inspect}"
             if ancestor.to_s == "Servlet"
               module_const.new
               break
             elsif ancestor.to_s == "Plugin"
-              puts "bundle_name: #{bundle_name}"
               module_const.new.register( bundle_name )
               break
             elsif ancestor.to_s == "Object"

data/lib/session/sessionstorage.rb

@@ -51,7 +51,14 @@ class SessionStorage
     
     @db_uri = ::RSence.config[:database][:ses_db]
     
-    db_init
+    if db_test
+      @db_avail = true
+      db_init
+    else
+      @db_avail = false
+      puts "Warning: Session database is not available. Can't use persistent sessions."
+      @id_counter = 0
+    end
     
     @accept_requests = true
     
@@ -60,15 +67,34 @@ class SessionStorage
   attr_reader :accept_requests
   
   def db_test
-    if @db.table_exists?(:rsence_test)
+    begin
+      db_open
+      if @db.table_exists?(:rsence_test)
+        @db.drop_table(:rsence_test)
+      end
+      @db.create_table(:rsence_test) { primary_key :id; String :test }
+      test_id = @db[:rsence_test].insert( :test => 'TestFoo' )
+      @db[:rsence_test].filter( :id => test_id ).update( :test => 'TestFoo2' )
+      @db[:rsence_test].filter( :id => test_id ).delete
+      @db[:rsence_test].delete
       @db.drop_table(:rsence_test)
+      db_close
+      return true
+    rescue => e
+      if RSence.args[:debug]
+        err_msg = [
+          "ERROR: SssionStorage couldn't open database",
+          "#{e.class.to_s}, #{e.message}",
+          "Backtrace:",
+          "\t"+e.backtrace.join("\n\t")
+        ].join("\n")+"\n"
+        $stderr.write( err_msg )
+      elsif RSence.args[:verbose]
+        puts "Failed to open database '#{@db_uri}'."
+        puts "Run RSence in debug mode for full error output."
+      end
+      return false
     end
-    @db.create_table(:rsence_test) { primary_key :id; String :test }
-    test_id = @db[:rsence_test].insert( :test => 'TestFoo' )
-    @db[:rsence_test].filter( :id => test_id ).update( :test => 'TestFoo2' )
-    @db[:rsence_test].filter( :id => test_id ).delete
-    @db[:rsence_test].delete
-    @db.drop_table(:rsence_test)
   end
   
   def db_close
@@ -76,26 +102,14 @@ class SessionStorage
   end
   
   def db_open
-    @db = Sequel.connect(@db_uri)
+    # work-around for windows (drive letters causing confusion)
+    if @db_uri.start_with?('sqlite://')
+      @db = Sequel.sqlite( @db_uri.split('sqlite://')[1] )
+    else
+      @db = Sequel.connect(@db_uri)
+    end
   end
   
-  # def db_open
-  #   ## Tests if database has sufficient privileges
-  #   begin
-  #     @db = Sequel.connect(@db_uri)
-  #     db_test
-  #     db_close
-  #     @db = Sequel.connect(@db_uri)
-  #   rescue => e
-  #     $stderr.write( "SessionStorage: error #{e.inspect}\nReverting to default database.\n" )
-  #     @db_uri = "sqlite://#{File.join(SERVER_PATH,'var','db','rsence_ses.db')}"
-  #     @db = Sequel.connect(@db_uri)
-  #     db_test
-  #     db_close
-  #     @db = Sequel.connect(@db_uri)
-  #   end
-  # end
-  
   ## Creates the 'rsence_session' table, if necessary
   ## This table is used to store sessions
   def create_session_table
@@ -181,6 +195,10 @@ class SessionStorage
   
   ## Deletes all rows from rsence_session as well as rsence_uploads
   def reset_sessions
+    unless @db_avail
+      puts "Warning: Can't reset sessions: No database!" if RSence.args[:verbose]
+      return
+    end
     db_open
     @db[:rsence_session].delete if @db.table_exists?(:rsence_session)
     @db[:rsence_uploads].delete if @db.table_exists?(:rsence_uploads)
@@ -189,6 +207,10 @@ class SessionStorage
   
   ## Restores all saved sessions from db to ram
   def restore_sessions
+    unless @db_avail
+      puts "Warning: Can't restore sessions: No database!" if RSence.args[:verbose]
+      return
+    end
     puts "Restoring sessions..." if RSence.args[:verbose]
     db_open
     @db[:rsence_session].all do |ses_row|
@@ -211,6 +233,10 @@ class SessionStorage
   
   ## Stores all sessions to db from ram
   def store_sessions
+    unless @db_avail
+      puts "Warning: Can't store sessions: No database!" if RSence.args[:verbose]
+      return
+    end
     puts "Storing sessions..." if RSence.args[:verbose]
     db_open
     @sessions.each_key do |ses_id|
@@ -241,6 +267,10 @@ class SessionStorage
   
   ## Returns a new, unique session identifier by storing the params to the database
   def new_ses_id( cookie_key, ses_key, timeout_secs, user_id=0 )
+    unless @db_avail
+      @id_counter += 1
+      return @id_counter
+    end
     db_open
     new_id = @db[:rsence_session].insert(
       :cookie_key  => cookie_key,
@@ -286,10 +316,12 @@ class SessionStorage
       @clone_targets.delete( ses_id ) if @clone_targets.has_key?( ses_id )
     end
     
-    db_open
-    # Deletes the session's row from the database
-    @db[:rsence_session].filter(:id => ses_id).delete
-    db_close
+    if @db_avail
+      db_open
+      # Deletes the session's row from the database
+      @db[:rsence_session].filter(:id => ses_id).delete
+      db_close
+    end
     
   end
   

data/lib/transporter/transporter.rb

@@ -30,16 +30,38 @@ class Transporter
   
   def initialize
     @config = ::RSence.config[:transporter_conf]
-    
+    @accept_req = false
     @valuemanager = ValueManager.new
     @sessions = SessionManager.new( self )
-    @plugins = PluginManager.new( ::RSence.config[:plugin_paths], self, RSence.args[:autoreload] )
+    @plugins = PluginManager.new( ::RSence.config[:plugin_paths], self, RSence.args[:autoupdate] )
     if RSence.launch_pid != Process.pid
       Process.kill( 'TERM', RSence.launch_pid )
     end
   end
   
+  def online?
+    @accept_req
+  end
+  
+  def online=(state)
+    if RSence.args[:verbose]
+      if state
+        puts "RSence is online now."
+      else
+        puts "RSence is offline now."
+      end
+    end
+    @accept_req = state
+  end
+  
+  def shutdown
+    online=false
+    @plugins.shutdown
+    @sessions.shutdown
+  end
+  
   def servlet( request_type, request, response )
+    
     broker_urls = ::RSence.config[:broker_urls]
     uri = request.fullpath
     

data/plugins/client_pkg/lib/client_pkg_build.rb

@@ -326,11 +326,7 @@ class ClientPkgBuild
     # make sure the src_dirs contain only absolute paths.
     # if not, use current working dir as a logical prefix
     @src_dirs.map! do |src_dir|
-      if src_dir[0].chr == '/'
-        src_dir
-      else
-        File.join( File.expand_path( Dir.pwd ), src_dir )
-      end
+      File.expand_path( src_dir )
     end
     
     @src_dirs.each do |src_dir|