From 423293dead2208aba3428e0b7add48416c34cef4 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 29 Nov 2007 11:20:26 +0000 Subject: Make dbhost configureable svn:r12600 --- contrib/auto-naming/build-approved-routers | 2 +- contrib/auto-naming/db-config.rb | 2 ++ contrib/auto-naming/db.rb | 4 ++-- contrib/auto-naming/process-consensus | 2 +- contrib/auto-naming/update-named-status.rb | 9 +++++++-- 5 files changed, 13 insertions(+), 6 deletions(-) (limited to 'contrib/auto-naming') diff --git a/contrib/auto-naming/build-approved-routers b/contrib/auto-naming/build-approved-routers index 4bbf8e779..805321f20 100755 --- 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 3cf2dbe32..b1508c1b7 100644 --- 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 b57724acd..822a26bad 100644 --- 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 2c8b481f5..dc9d207e4 100755 --- 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 b4d1b2d61..951e7e687 100755 --- 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 -- cgit v1.2.3