← Back to branch summary

~openerp-dev/openobject-server/trunk-imp-onchange-behave-darshan

« back to all changes in this revision

Viewing changes to openerp/service/server.py

  • Committer: Darshan Kalola(OpenERP)
  • Date: 2014-04-09 08:44:52 UTC
  • mfrom: (4936.1.232 openobject-server)
  • Revision ID: dka@tinyerp.com-20140409084452-w1e499j21i3eli9d
[MERGE]sync with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openerp/service/server.py
9
9
import platform
10
10
import psutil
11
11
import random
12
 
import resource
 
12
if os.name == 'posix':
 
13
    import resource
 
14
else:
 
15
    resource = None
13
16
import select
14
17
import signal
15
18
import socket
437
440
            sys.exit(0)
438
441
 
439
442
    def long_polling_spawn(self):
440
 
        nargs = stripped_sys_argv('--pidfile', '--workers')
 
443
        nargs = stripped_sys_argv()
441
444
        cmd = nargs[0]
442
445
        cmd = os.path.join(os.path.dirname(cmd), "openerp-gevent")
443
446
        nargs[0] = cmd
638
641
                raise
639
642
 
640
643
    def process_limit(self):
 
644
        if resource is None:
 
645
            return
641
646
        # If our parent changed sucide
642
647
        if self.ppid != os.getppid():
643
648
            _logger.info("Worker (%s) Parent changed", self.pid)
829
834
 
830
835
def load_test_file_yml(registry, test_file):
831
836
    with registry.cursor() as cr:
832
 
        openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
833
 
        cr.rollback()
 
837
        openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'init')
 
838
        if config['test_commit']:
 
839
            _logger.info('test %s has been commited', test_file)
 
840
            cr.commit()
 
841
        else:
 
842
            _logger.info('test %s has been rollbacked', test_file)
 
843
            cr.rollback()
834
844
 
835
845
def load_test_file_py(registry, test_file):
836
846
    # Locate python module based on its filename and run the tests
846
856
                stream = openerp.modules.module.TestStream()
847
857
                result = unittest2.TextTestRunner(verbosity=2, stream=stream).run(suite)
848
858
                success = result.wasSuccessful()
849
 
                registry._assertion_report.report_result(success)
 
859
                if hasattr(registry._assertion_report,'report_result'):
 
860
                    registry._assertion_report.report_result(success)
850
861
                if not success:
851
862
                    _logger.error('%s: at least one error occurred in a test', test_file)
852
863
 
881
892
    """
882
893
    global server
883
894
    load_server_wide_modules()
884
 
    if config['workers']:
 
895
    if openerp.evented:
 
896
        server = GeventServer(openerp.service.wsgi_server.application)
 
897
    elif config['workers']:
885
898
        server = PreforkServer(openerp.service.wsgi_server.application)
886
 
    elif openerp.evented:
887
 
        server = GeventServer(openerp.service.wsgi_server.application)
888
899
    else:
889
900
        server = ThreadedServer(openerp.service.wsgi_server.application)
890
901