[pytango] 450/483: server_init and post_init callback should be executed outside tango loop

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit 5e8d1dd1e090f2bac36a38ea22e3650a31db2ef0
Author: coutinho <coutinho at esrf.fr>
Date:   Wed Mar 25 10:40:00 2015 +0100

    server_init and post_init callback should be executed outside tango loop
---
 src/boost/python/server.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/boost/python/server.py b/src/boost/python/server.py
index 920ce29..5850d41 100644
--- a/src/boost/python/server.py
+++ b/src/boost/python/server.py
@@ -882,27 +882,25 @@ def __server_run(classes, args=None, msg_stream=sys.stdout, util=None,
 
     if util is None:
         util = PyTango.Util(args)
-    u_instance = PyTango.Util.instance()
 
     if gevent_mode and event_loop:
         gevent_worker = _create_gevent_worker()
         event_loop = functools.partial(gevent_worker.execute, event_loop)
 
     if event_loop is not None:
-        u_instance.server_set_event_loop(event_loop)
+        util.server_set_event_loop(event_loop)
 
     log = logging.getLogger("PyTango")
 
+    log.debug("Tango init")
+    _add_classes(util, classes)
+    util.server_init()
+    post_init_callback()
+
     def tango_loop(worker=None):
         log.debug("Tango loop started")
-        _add_classes(util, classes)
-        u_instance.server_init()
-        if worker:
-            worker.execute(post_init_callback)
-        else:
-            post_init_callback()
         write("Ready to accept request\n")
-        u_instance.server_run()
+        util.server_run()
         if worker:
             worker.stop()
         log.debug("Tango loop exit")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git