KERNEL: improve logger and remove some prints
bzr revid: ced-f90f08fa29036c2385c5ed0d5e1762f07425cd36
This commit is contained in:
parent
454d2bb68a
commit
666dd051cd
|
@ -29,6 +29,7 @@ import sql_db
|
||||||
import osv.osv
|
import osv.osv
|
||||||
import tools
|
import tools
|
||||||
import addons
|
import addons
|
||||||
|
import netsvc
|
||||||
|
|
||||||
db_dic = {}
|
db_dic = {}
|
||||||
pool_dic = {}
|
pool_dic = {}
|
||||||
|
@ -37,7 +38,8 @@ def get_db_and_pool(db_name, force_demo=False, status={}, update_module=False):
|
||||||
if db_name in db_dic:
|
if db_name in db_dic:
|
||||||
db = db_dic[db_name]
|
db = db_dic[db_name]
|
||||||
else:
|
else:
|
||||||
print 'Pooler Connecting to', db_name
|
logger = netsvc.Logger()
|
||||||
|
logger.notifyChannel('pooler', netsvc.LOG_INFO, 'Connecting to %s' % (db_name))
|
||||||
db = sql_db.db_connect(db_name)
|
db = sql_db.db_connect(db_name)
|
||||||
db_dic[db_name] = db
|
db_dic[db_name] = db
|
||||||
|
|
||||||
|
|
|
@ -73,9 +73,9 @@ class db(netsvc.Service):
|
||||||
self.actions[id] = {'clean': False}
|
self.actions[id] = {'clean': False}
|
||||||
|
|
||||||
if tools.config['db_user']:
|
if tools.config['db_user']:
|
||||||
res = tools.exec_pg_command('createdb', '--encoding=unicode', '--username='+tools.config['db_user'], db_name)
|
res = tools.exec_pg_command('createdb', '--quiet', '--encoding=unicode', '--username='+tools.config['db_user'], db_name)
|
||||||
else:
|
else:
|
||||||
res = tools.exec_pg_command('createdb', '--encoding=unicode', db_name)
|
res = tools.exec_pg_command('createdb', '--quiet', '--encoding=unicode', db_name)
|
||||||
if not res:
|
if not res:
|
||||||
class DBInitialize(object):
|
class DBInitialize(object):
|
||||||
def __call__(self, serv, id, db_name, demo, lang):
|
def __call__(self, serv, id, db_name, demo, lang):
|
||||||
|
@ -109,6 +109,8 @@ class db(netsvc.Service):
|
||||||
traceback_str = e_str.getvalue()
|
traceback_str = e_str.getvalue()
|
||||||
e_str.close()
|
e_str.close()
|
||||||
serv.actions[id]['traceback'] = traceback_str
|
serv.actions[id]['traceback'] = traceback_str
|
||||||
|
logger = netsvc.Logger()
|
||||||
|
logger.notifyChannel("web-services", netsvc.LOG_INFO, 'CREATE DB: %s' % (db_name))
|
||||||
|
|
||||||
dbi = DBInitialize()
|
dbi = DBInitialize()
|
||||||
create_thread = threading.Thread(target=dbi, args=(self, id, db_name, demo, lang))
|
create_thread = threading.Thread(target=dbi, args=(self, id, db_name, demo, lang))
|
||||||
|
@ -138,12 +140,14 @@ class db(netsvc.Service):
|
||||||
security.check_super(password)
|
security.check_super(password)
|
||||||
pooler.close_db(db_name)
|
pooler.close_db(db_name)
|
||||||
if tools.config['db_user']:
|
if tools.config['db_user']:
|
||||||
res = tools.exec_pg_command('dropdb', '--username='+tools.config['db_user'], db_name)
|
res = tools.exec_pg_command('dropdb', '--quiet', '--username='+tools.config['db_user'], db_name)
|
||||||
else:
|
else:
|
||||||
res = tools.exec_pg_command('dropdb', db_name)
|
res = tools.exec_pg_command('dropdb', '--quiet', db_name)
|
||||||
if res:
|
if res:
|
||||||
raise "Couldn't drop database"
|
raise "Couldn't drop database"
|
||||||
else:
|
else:
|
||||||
|
logger = netsvc.Logger()
|
||||||
|
logger.notifyChannel("web-services", netsvc.LOG_INFO, 'DROP DB: %s' % (db_name))
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def dump(self, password, db_name):
|
def dump(self, password, db_name):
|
||||||
|
@ -156,6 +160,8 @@ class db(netsvc.Service):
|
||||||
stdin.close()
|
stdin.close()
|
||||||
res = stdout.read()
|
res = stdout.read()
|
||||||
stdout.close()
|
stdout.close()
|
||||||
|
logger = netsvc.Logger()
|
||||||
|
logger.notifyChannel("web-services", netsvc.LOG_INFO, 'DUMP DB: %s' % (db_name))
|
||||||
return base64.encodestring(res)
|
return base64.encodestring(res)
|
||||||
|
|
||||||
def restore(self, password, db_name, data):
|
def restore(self, password, db_name, data):
|
||||||
|
@ -165,10 +171,10 @@ class db(netsvc.Service):
|
||||||
raise "Database already exists"
|
raise "Database already exists"
|
||||||
else:
|
else:
|
||||||
if tools.config['db_user']:
|
if tools.config['db_user']:
|
||||||
args = ('createdb', '--encoding=unicode', '--username='+tools.config['db_user'], db_name)
|
args = ('createdb', '--quiet', '--encoding=unicode', '--username='+tools.config['db_user'], db_name)
|
||||||
args2 = ('pg_restore', '-U', tools.config['db_user'], '-d %s' % db_name)
|
args2 = ('pg_restore', '-U', tools.config['db_user'], '-d %s' % db_name)
|
||||||
else:
|
else:
|
||||||
args = ('createdb', '--encoding=unicode', db_name)
|
args = ('createdb', '--quiet', '--encoding=unicode', db_name)
|
||||||
args2 = ('pg_restore', '-d %s' % db_name)
|
args2 = ('pg_restore', '-d %s' % db_name)
|
||||||
res = tools.exec_pg_command(*args)
|
res = tools.exec_pg_command(*args)
|
||||||
if not res:
|
if not res:
|
||||||
|
@ -185,6 +191,8 @@ class db(netsvc.Service):
|
||||||
stdin.write(base64.decodestring(data))
|
stdin.write(base64.decodestring(data))
|
||||||
stdin.close()
|
stdin.close()
|
||||||
stdout.close()
|
stdout.close()
|
||||||
|
logger = netsvc.Logger()
|
||||||
|
logger.notifyChannel("web-services", netsvc.LOG_INFO, 'RESTORE DB: %s' % (db_name))
|
||||||
return True
|
return True
|
||||||
raise "Couldn't create database"
|
raise "Couldn't create database"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue