NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 15:35:46 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot: connect to sql-db via uri

Browse Source
This commit is contained in:
Christophe Simonis 2014-09-05 16:35:50 +02:00
parent b1230795b4
commit 4a173cd34c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runbot/runbot.py
View File

@ -29,7 +29,7 @@ import openerp
from openerp import http
from openerp.http import request
from openerp.osv import fields, osv
from openerp.tools import appdirs
from openerp.tools import config, appdirs
from openerp.addons.website.models.website import slug
from openerp.addons.website_sale.controllers.main import QueryURL
@ -359,7 +359,7 @@ class runbot_repo(osv.osv):
def reload_nginx(self, cr, uid, context=None):
settings = {}
settings['port'] = openerp.tools.config['xmlrpc_port']
settings['port'] = config['xmlrpc_port']
nginx_dir = os.path.join(self.root(cr, uid), 'nginx')
settings['nginx_dir'] = nginx_dir
ids = self.search(cr, uid, [('nginx','=',True)], order='id')
@ -685,7 +685,10 @@ class runbot_build(osv.osv):
if grep(build.server("tools/config.py"), "no-netrpc"):
cmd.append("--no-netrpc")
if grep(build.server("tools/config.py"), "log-db"):
cmd += ["--log-db=%s" % cr.dbname]
logdb = cr.dbname
if grep(build.server('openerp/sql_db.py'), 'allow_uri'):
logdb = 'postgres://{cfg.db_user}:{cfg.db_password}@{cfg.db_host}/{db}'.format(cfg=config, db=cr.dbname)
cmd += ["--log-db=%s" % logdb]
# coverage
#coverage_file_path=os.path.join(log_path,'coverage.pickle')