Removed setup and added stop module-level function.

This commit is contained in:
Nick Daly 2012-05-29 19:58:14 -05:00
parent 4da0abfd5e
commit 1aab4c98c1

View File

@ -11,16 +11,6 @@ import sys
import logging
def setup(santiago):
"""Module-level setup function.
Called after listener and senders are set up, before they're started.
# TODO call this bugger to prep the dispatcher, objects, etc.
"""
pass
def start():
"""Module-level start function, called after listener and sender started.
@ -31,6 +21,14 @@ def start():
"""
cherrypy.engine.start()
def stop():
"""Module-level stop function, called after listener and sender stopped.
"""
cherrypy.engine.stop()
cherrypy.engine.exit()
class Listener(santiago.SantiagoListener):
def __init__(self, my_santiago, socket_port=0,
@ -42,32 +40,15 @@ class Listener(santiago.SantiagoListener):
cherrypy.server.ssl_certificate = ssl_certificate
cherrypy.server.ssl_private_key = ssl_private_key
cherrypy.tree.mount(cherrypy.Application(self, "/"))
def start(self):
"""Starts the listener."""
santiago.debug_log("Starting listener.")
cherrypy.engine.start()
santiago.debug_log("Listener started.")
def stop(self):
"""Shuts down the listener."""
santiago.debug_log("Stopping listener.")
cherrypy.engine.stop()
cherrypy.engine.exit()
santiago.debug_log("Listener stopped.")
@cherrypy.expose
def index(self, **kwargs):
"""Receive an incoming Santiago request from another Santiago client."""
santiago.debug_log("protocols.https.index: Received request {0}".format(str(kwargs)))
santiago.debug_log("Received request {0}".format(str(kwargs)))
try:
self.incoming_request(kwargs["request"])
except Exception as e: