Make dbhost configureable

svn:r12600

diff --git a/contrib/auto-naming/build-approved-routers b/contrib/auto-naming/build-approved-routers
index 4bbf8e7795c09f32c91f27a449b174f39ca6551d..805321f2082100824c766403556fa4203ff91c3a 100755 (executable)
--- a/contrib/auto-naming/build-approved-routers
+++ b/contrib/auto-naming/build-approved-routers
@@ -30,7 +30,7 @@ require 'db-config'
 
 verbose = ARGV.first == "-v"
 
-db = Db.new($CONFIG['database']['dbname'], $CONFIG['database']['user'], $CONFIG['database']['password'])
+db = Db.new($CONFIG['database']['dbhost'], $CONFIG['database']['dbname'], $CONFIG['database']['user'], $CONFIG['database']['password'])
 
 db.transaction_begin
 named = db.query2("

diff --git a/contrib/auto-naming/db-config.rb b/contrib/auto-naming/db-config.rb
index 3cf2dbe32a809313beec80ba5bfbbdb22e06b4ec..b1508c1b7020eb43d04fc2fd531db4eafa23e690 100644 (file)
--- a/contrib/auto-naming/db-config.rb
+++ b/contrib/auto-naming/db-config.rb
@@ -1,6 +1,8 @@
 $CONFIG             = {} unless $CONFIG
 $CONFIG['database'] = {} unless $CONFIG['database']
 
+# if you use postgres' "ident sameuser" auth set dbhost to ''
+$CONFIG['database']['dbhost'] = 'localhost';
 $CONFIG['database']['dbname'] = 'tornaming';
 $CONFIG['database']['user'] = 'tornaming';
 $CONFIG['database']['password'] = 'x';

diff --git a/contrib/auto-naming/db.rb b/contrib/auto-naming/db.rb
index b57724acdd6ecc224da334f31456aa88152b4500..822a26bad7a0f243f57a1b5282eecc7ad1ccd860 100644 (file)
--- a/contrib/auto-naming/db.rb
+++ b/contrib/auto-naming/db.rb
@@ -39,8 +39,8 @@ class WeaselDbQueryHandle
 end
 
 class Db
-       def initialize(database, user, password)
-               @dbh = DBI.connect("dbi:Pg:#{database}:localhost", user, password);
+       def initialize(host, database, user, password)
+               @dbh = DBI.connect("dbi:Pg:#{database}:#{host}", user, password);
                @dbh['AutoCommit'] = false
                @transaction = false
                @pre_initial_transaction=true

diff --git a/contrib/auto-naming/process-consensus b/contrib/auto-naming/process-consensus
index 2c8b481f5deaa75aeee9e1e0e937f592ac1a8493..dc9d207e43aeb26bc3168d9dfd4c46e575c517e9 100755 (executable)
--- a/contrib/auto-naming/process-consensus
+++ b/contrib/auto-naming/process-consensus
@@ -31,7 +31,7 @@ require 'db'
 require 'db-config'
 require 'update-named-status'
 
-$db = Db.new($CONFIG['database']['dbname'], $CONFIG['database']['user'], $CONFIG['database']['password'])
+$db = Db.new($CONFIG['database']['dbhost'], $CONFIG['database']['dbname'], $CONFIG['database']['user'], $CONFIG['database']['password'])
 
 $router_cache = {}
 $nickname_cache = {}

diff --git a/contrib/auto-naming/update-named-status.rb b/contrib/auto-naming/update-named-status.rb
index b4d1b2d612c2886ac8fda222c3061ef18b193da2..951e7e687ab5fa4b81b8be2d31c673dd6915b7cc 100755 (executable)
--- a/contrib/auto-naming/update-named-status.rb
+++ b/contrib/auto-naming/update-named-status.rb
@@ -28,7 +28,12 @@ require 'db'
 require 'db-config'
 
 def do_update(verbose)
-       now = "TIMESTAMP '" + $db.query_row("SELECT max(last_seen) AS max FROM router_claims_nickname")['max'].to_s + "'"
+       now = $db.query_row("SELECT max(last_seen) AS max FROM router_claims_nickname")['max']
+       unless now == ''
+               STDERR.puts "Could not find the latest last_seen timestamp.  Is the database empty still?"
+               return
+       end
+       now = "TIMESTAMP '" + now.to_s + "'"
 
        denamed = $db.do("
                        UPDATE router_claims_nickname
@@ -56,7 +61,7 @@ def do_update(verbose)
 end
 
 if __FILE__ == $0
-       $db = Db.new($CONFIG['database']['dbname'], $CONFIG['database']['user'], $CONFIG['database']['password'])
+       $db = Db.new($CONFIG['database']['dbhost'], $CONFIG['database']['dbname'], $CONFIG['database']['user'], $CONFIG['database']['password'])
        verbose = ARGV.first == "-v"
 
        $db.transaction_begin