openstack/ironic-python-agent
Code Issues Proposed changes

use cherrypy in place of werkzeug dev server

Browse Source
This commit is contained in:
Russell Haering 2014-01-10 13:49:48 -08:00
parent 16e04faf50
commit 1a9189dce9
1 changed files with 10 additions and 2 deletions

12
teeth_agent/base.py

@ -21,10 +21,10 @@ import threading
import time import time
import uuid import uuid
from cherrypy import wsgiserver
import pkg_resources import pkg_resources
from teeth_rest import encoding from teeth_rest import encoding
from teeth_rest import errors as rest_errors from teeth_rest import errors as rest_errors
from werkzeug import serving
from teeth_agent import api from teeth_agent import api
from teeth_agent import errors from teeth_agent import errors
@ -270,5 +270,13 @@ class BaseTeethAgent(object):
self.started_at = time.time() self.started_at = time.time()
self.heartbeater.start() self.heartbeater.start()
serving.run_simple(self.listen_host, self.listen_port, self.api)
listen_address = (self.listen_host, self.listen_port)
server = wsgiserver.CherryPyWSGIServer(listen_address, self.api)
try:
server.start()
except BaseException:
server.stop()
self.heartbeater.stop() self.heartbeater.stop()