[MERGE] forward port of branch 7.0 up to d566558
This commit is contained in:
commit
885565968f
|
@ -161,6 +161,8 @@
|
||||||
<field name="priority">50</field>
|
<field name="priority">50</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<search string="Membership Partners">
|
<search string="Membership Partners">
|
||||||
|
<field name="name"
|
||||||
|
filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"/>
|
||||||
<field name="membership_start" invisible="1"/>
|
<field name="membership_start" invisible="1"/>
|
||||||
<field name="membership_stop" string="End Membership Date"/>
|
<field name="membership_stop" string="End Membership Date"/>
|
||||||
<filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
|
<filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
|
||||||
|
|
|
@ -570,7 +570,7 @@ class PreforkServer(CommonServer):
|
||||||
_logger.info("Stopping gracefully")
|
_logger.info("Stopping gracefully")
|
||||||
limit = time.time() + self.timeout
|
limit = time.time() + self.timeout
|
||||||
for pid in self.workers.keys():
|
for pid in self.workers.keys():
|
||||||
self.worker_kill(pid, signal.SIGTERM)
|
self.worker_kill(pid, signal.SIGINT)
|
||||||
while self.workers and time.time() < limit:
|
while self.workers and time.time() < limit:
|
||||||
self.process_zombie()
|
self.process_zombie()
|
||||||
time.sleep(0.1)
|
time.sleep(0.1)
|
||||||
|
|
Loading…
Reference in New Issue