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

[IMP] add starting port as configuration option

Browse Source
This commit is contained in:
Gery Debongnie 2014-07-16 10:11:29 +02:00
parent b4e680f095
commit 5579fae1c8
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
runbot/res_config.py
View File

@ -27,7 +27,8 @@ class runbot_config_settings(osv.osv_memory):
_columns = { _columns = {
'default_workers': fields.integer('Total Number of Workers'), 'default_workers': fields.integer('Total Number of Workers'),
'default_running_max': fields.integer('Maximum Number of Running Builds'), 'default_running_max': fields.integer('Maximum Number of Running Builds'),
'default_timeout': fields.integer('Default timeout (in seconds)'), 'default_timeout': fields.integer('Default Timeout (in seconds)'),
'default_starting_port': fields.integer('Starting Port for Running Builds'),
} }
def get_default_parameters(self, cr, uid, fields, context=None): def get_default_parameters(self, cr, uid, fields, context=None):
@ -35,9 +36,12 @@ class runbot_config_settings(osv.osv_memory):
workers = icp.get_param(cr, uid, 'runbot.workers', default=6) workers = icp.get_param(cr, uid, 'runbot.workers', default=6)
running_max = icp.get_param(cr, uid, 'runbot.running_max', default=75) running_max = icp.get_param(cr, uid, 'runbot.running_max', default=75)
timeout = icp.get_param(cr, uid, 'runbot.timeout', default=1800) timeout = icp.get_param(cr, uid, 'runbot.timeout', default=1800)
starting_port = icp.get_param(cr, uid, 'runbot.starting_port', default=2000)
return { return {
'default_workers': int(workers), 'default_workers': int(workers),
'default_running_max': int(running_max) 'default_running_max': int(running_max),
'default_timeout': int(timeout),
'default_starting_port': int(starting_port),
} }
def set_default_parameters(self, cr, uid, ids, context=None): def set_default_parameters(self, cr, uid, ids, context=None):
@ -46,12 +50,7 @@ class runbot_config_settings(osv.osv_memory):
icp.set_param(cr, uid, 'runbot.workers', config.default_workers) icp.set_param(cr, uid, 'runbot.workers', config.default_workers)
icp.set_param(cr, uid, 'runbot.running_max', config.default_running_max) icp.set_param(cr, uid, 'runbot.running_max', config.default_running_max)
icp.set_param(cr, uid, 'runbot.timeout', config.default_timeout) icp.set_param(cr, uid, 'runbot.timeout', config.default_timeout)
icp.set_param(cr, uid, 'runbot.starting_port', config.default_starting_port)
_defaults = {
'default_workers': 6,
'default_running_max': 75,
'default_timeout': 1800,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
runbot/res_config_view.xml
View File

@ -28,6 +28,10 @@
<field name="default_timeout" class="oe_inline"/> <field name="default_timeout" class="oe_inline"/>
<label for="default_timeout"/> <label for="default_timeout"/>
</div> </div>
<div>
<field name="default_starting_port" class="oe_inline"/>
<label for="default_starting_port"/>
</div>
</div> </div>
</group> </group>
</form> </form>

4
runbot/runbot.py
View File

@ -474,8 +474,8 @@ class runbot_build(osv.osv):
ports = set(i['port'] for i in self.read(cr, uid, ids, ['port'])) ports = set(i['port'] for i in self.read(cr, uid, ids, ['port']))
# starting port # starting port
# TODO take ir.config.parameters or 9000 icp = self.pool['ir.config_parameter']
port = 2000 port = int(icp.get_param(cr, uid, 'runbot.starting_port', default=2000))
# find next free port # find next free port
while port in ports: while port in ports: