X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Fdbhash.rb;h=b32da5004fdf34265f5d15d7a119a4f2d4b86d58;hb=7f4e98a691ba6ee6f220fec982f17c900c929f1d;hp=ed5b9e61511f2237dd609148b14a474983b92f1d;hpb=8483e916ca3f1bc5450dc8c6966786b6958c2465;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/lib/rbot/dbhash.rb b/lib/rbot/dbhash.rb
index ed5b9e61..b32da500 100644
--- a/lib/rbot/dbhash.rb
+++ b/lib/rbot/dbhash.rb
@@ -1,8 +1,8 @@
 begin
   require 'bdb'
 rescue Exception => e
-  puts "Got exception: "+e
-  puts "rbot couldn't load the bdb module, perhaps you need to install it? try: http://www.ruby-lang.org/en/raa-list.rhtml?name=bdb"
+  error "Got exception: "+e
+  error "rbot couldn't load the bdb module, perhaps you need to install it? try: http://www.ruby-lang.org/en/raa-list.rhtml?name=bdb"
   exit 2
 end
 
@@ -10,7 +10,10 @@ end
 module BDB
   class CIBtree < Btree
     def bdb_bt_compare(a, b)
-      a.downcase <=> b.downcase
+      if a == nil || b == nil
+        warning "CIBTree: comparing #{a.inspect} (#{self[a].inspect}) with #{b.inspect} (#{self[b].inspect})"
+      end
+      (a||'').downcase <=> (b||'').downcase
     end
   end
 end
@@ -66,7 +69,7 @@ module Irc
     @@env=nil
     # TODO: make this customizable
     # Note that it must be at least four times lg_bsize
-    @@lg_max = 2*1024*1024
+    @@lg_max = 8*1024*1024
     # absfilename:: use +key+ as an actual filename, don't prepend the bot's
     #               config path and don't append ".db"
     def initialize(bot, key, absfilename=false)
@@ -112,13 +115,14 @@ module Irc
       return @@env.open_db(BDB::CIBtree, name, nil, "r+", 0600)
     end
 
-    def DBTree.cleanup_env()
+    def DBTree.cleanup_logs()
+      begin
+        debug "DBTree: checkpointing ..."
+        @@env.checkpoint
+      rescue => e
+        debug "Failed: #{e}"
+      end
       begin
-        debug "DBTree: checking transactions ..."
-        has_active_txn = @@env.txn_stat["st_nactive"] > 0
-        if has_active_txn
-          debug "DBTree: WARNING: not all transactions completed!"
-        end
         debug "DBTree: flushing log ..."
         @@env.log_flush
         logs = @@env.log_archive(BDB::ARCH_ABS)
@@ -126,6 +130,34 @@ module Irc
         logs.each { |log|
           File.delete(log)
         }
+      rescue => e
+        debug "Failed: #{e}"
+      end
+    end
+
+    def DBTree.stats()
+      begin
+        debug "General stats:"
+        debug @@env.stat
+        debug "Lock stats:"
+        debug @@env.lock_stat
+        debug "Log stats:"
+        debug @@env.log_stat
+        debug "Txn stats:"
+        debug @@env.txn_stat
+      rescue
+        debug "Couldn't dump stats"
+      end
+    end
+
+    def DBTree.cleanup_env()
+      begin
+        debug "DBTree: checking transactions ..."
+        has_active_txn = @@env.txn_stat["st_nactive"] > 0
+        if has_active_txn
+          warning "DBTree: not all transactions completed!"
+        end
+        DBTree.cleanup_logs
         debug "DBTree: closing environment #{@@env}"
         path = @@env.home
         @@env.close
@@ -137,7 +169,7 @@ module Irc
           BDB::Env.remove("#{path}")
         end
       rescue => e
-        debug "Failed: #{e}"
+        error "failed to clean up environment: #{e.inspect}"
       end
     end