From 90dea2816613b7ce40c21eddb90e94e8cee73e97 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Thu, 29 Jan 2009 14:39:46 +0100 Subject: [PATCH] [REV] Revert code for the hostname and the dump bzr revid: stephane@tinyerp.com-20090129133946-l05fi1j8rou9tqyn --- bin/service/web_services.py | 8 +++++--- bin/sql_db.py | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/service/web_services.py b/bin/service/web_services.py index 07ac740d9ae..44c853a6d4b 100644 --- a/bin/service/web_services.py +++ b/bin/service/web_services.py @@ -173,7 +173,7 @@ class db(netsvc.Service): cmd = ['pg_dump', '--format=c'] if tools.config['db_user']: cmd.append('--username=' + tools.config['db_user']) - if tools.config['db_host'] and tools.config['db_host'] not in ('127.0.0.1', 'localhost'): + if tools.config['db_host']: cmd.append('--host=' + tools.config['db_host']) if tools.config['db_port']: cmd.append('--port=' + tools.config['db_port']) @@ -184,9 +184,11 @@ class db(netsvc.Service): data = stdout.read() res = stdout.close() if res: - logger.notifyChannel("web-services", netsvc.LOG_ERROR, 'DUMP DB: %s failed\n%s' % (db_name, data)) + logger.notifyChannel("web-services", netsvc.LOG_ERROR, + 'DUMP DB: %s failed\n%s' % (db_name, data)) raise Exception, "Couldn't dump database" - logger.notifyChannel("web-services", netsvc.LOG_INFO, 'DUMP DB: %s' % (db_name)) + logger.notifyChannel("web-services", netsvc.LOG_INFO, + 'DUMP DB: %s' % (db_name)) return base64.encodestring(data) def restore(self, password, db_name, data): diff --git a/bin/sql_db.py b/bin/sql_db.py index acc4bb39ec5..b0212ac1ea4 100644 --- a/bin/sql_db.py +++ b/bin/sql_db.py @@ -204,8 +204,6 @@ class PoolManager(object): cls._dsn = '' for p in ('host', 'port', 'user', 'password'): cfg = tools.config['db_' + p] - if p == 'host' and cfg in ('127.0.0.1', 'localhost'): - continue if cfg: cls._dsn += '%s=%s ' % (p, cfg) return '%s dbname=%s' % (cls._dsn, db_name)