Skip to content

Commit

Permalink
Merge pull request #178 from acsone/9.0-mig-sbi
Browse files Browse the repository at this point in the history
Some more 9.0 migration
  • Loading branch information
guewen committed Mar 3, 2016
2 parents cfa4f54 + 09425c5 commit 155f2c9
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 456 deletions.
8 changes: 8 additions & 0 deletions connector/CHANGES.rst
Expand Up @@ -7,6 +7,14 @@ Changelog
.. *
9.0.1.0.1 (2016-03-03)
~~~~~~~~~~~~~~~~~~~~~~

* Enabled the JobRunner by default, with a default channels configuration of root:1
* Removed the old workers
* Removed the broken dbfilter support (https://github.com/OCA/connector/issues/58)
* Cleaned the methods that have been deprecated in version 3.x

8.0.3.3.0 (2016-02-29)
~~~~~~~~~~~~~~~~~~~~~~

Expand Down
4 changes: 2 additions & 2 deletions connector/__openerp__.py
Expand Up @@ -20,7 +20,7 @@
##############################################################################

{'name': 'Connector',
'version': '9.0.1.0.0',
'version': '9.0.1.0.1',
'author': 'Camptocamp,Openerp Connector Core Editors,'
'Odoo Community Association (OCA)',
'website': 'http://odoo-connector.com',
Expand All @@ -40,6 +40,6 @@
'setting_view.xml',
'res_partner_view.xml',
],
'installable': False,
'installable': True,
'application': True,
}
1 change: 0 additions & 1 deletion connector/connector.py
Expand Up @@ -23,7 +23,6 @@
import logging
import struct

from contextlib import contextmanager
from openerp import models, fields

from .exception import RetryableJobError
Expand Down
7 changes: 2 additions & 5 deletions connector/jobrunner/__init__.py
Expand Up @@ -46,9 +46,6 @@
# to configure the runner (channels mostly).


enable = os.environ.get('ODOO_CONNECTOR_CHANNELS')


class ConnectorRunnerThread(Thread):

def __init__(self):
Expand Down Expand Up @@ -78,7 +75,7 @@ def stop(self):
def prefork_start(server, *args, **kwargs):
global runner_thread
res = orig_prefork_start(server, *args, **kwargs)
if enable and not config['stop_after_init']:
if not config['stop_after_init']:
_logger.info("starting jobrunner thread (in prefork server)")
runner_thread = ConnectorRunnerThread()
runner_thread.start()
Expand All @@ -99,7 +96,7 @@ def prefork_stop(server, graceful=True):
def threaded_start(server, *args, **kwargs):
global runner_thread
res = orig_threaded_start(server, *args, **kwargs)
if enable and not config['stop_after_init']:
if not config['stop_after_init']:
_logger.info("starting jobrunner thread (in threaded server)")
runner_thread = ConnectorRunnerThread()
runner_thread.start()
Expand Down
41 changes: 0 additions & 41 deletions connector/queue/queue.py

This file was deleted.

0 comments on commit 155f2c9

Please sign in to comment.