sessionstorage.rb in rsence-2.0.0.2.pre

- old
+ new

@@ -99,11 +99,11 @@
   ## Creates the 'rsence_session' table, if necessary
   ## This table is used to store sessions
   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  )
         column( :ses_key,     String  )
         column( :ses_timeout, Integer )
@@ -119,11 +119,11 @@
   ## Creates the 'rsence_version' table, if necessary
   ## This table is used to check for the need of future database upgrades
   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
       @db[:rsence_version].insert(:version => 586)
     end
@@ -133,11 +133,11 @@
   ## Creates the 'rsence_uploads' table, if necessary
   ## This table is used for storing temporary uploads before processing
   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 )
         column( :upload_date, Integer )
         column( :upload_done, Integer )
@@ -187,11 +187,11 @@
     db_close
   end
   
   ## 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]
       ses_data_dump = ses_row[:ses_data]
       
@@ -209,11 +209,11 @@
     db_close
   end
   
   ## 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 ]
       ses_data_dump = Marshal.dump( ses_data )
       @db[:rsence_session].filter(
@@ -231,12 +231,12 @@
   end
   
   ## 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
   
   
   ## 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 )