Require Pyro4 >= 4.30

This commit is contained in:
Anders Ingemann 2014-11-30 13:58:10 +01:00
parent c5bc45218e
commit a7a3161d66
2 changed files with 8 additions and 2 deletions

View file

@ -1,4 +1,7 @@
import Pyro4
import logging import logging
Pyro4.config.REQUIRE_EXPOSE = True
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -41,23 +44,26 @@ class Server(object):
self.listen_port = listen_port self.listen_port = listen_port
def start(self): def start(self):
import Pyro4
Pyro4.config.COMMTIMEOUT = 0.5 Pyro4.config.COMMTIMEOUT = 0.5
daemon = Pyro4.Daemon('localhost', port=int(self.listen_port), unixsocket=None) daemon = Pyro4.Daemon('localhost', port=int(self.listen_port), unixsocket=None)
daemon.register(self, 'server') daemon.register(self, 'server')
daemon.requestLoop(loopCondition=lambda: not self.stop_serving) daemon.requestLoop(loopCondition=lambda: not self.stop_serving)
@Pyro4.expose
def run(self, *args, **kwargs): def run(self, *args, **kwargs):
from bootstrapvz.base.main import run from bootstrapvz.base.main import run
return run(*args, **kwargs) return run(*args, **kwargs)
@Pyro4.expose
def set_log_server(self, server): def set_log_server(self, server):
self.log_forwarder.set_server(server) self.log_forwarder.set_server(server)
log.debug('Successfully set the log forwarding server') log.debug('Successfully set the log forwarding server')
@Pyro4.expose
def ping(self): def ping(self):
return 'pong' return 'pong'
@Pyro4.expose
def stop(self): def stop(self):
self.stop_serving = True self.stop_serving = True

View file

@ -18,7 +18,7 @@ commands = nosetests -v tests/unit --with-coverage --cover-package=bootstrapvz -
[testenv:integration] [testenv:integration]
deps = deps =
nose nose
Pyro4 >= 4.26 Pyro4 >= 4.30
pyvbox >= 0.2.0 pyvbox >= 0.2.0
commands = nosetests -v tests/integration --with-coverage --cover-package=bootstrapvz --cover-inclusive commands = nosetests -v tests/integration --with-coverage --cover-package=bootstrapvz --cover-inclusive