# HG changeset patch # User Sylvain Thénault # Date 1269006229 -3600 # Node ID 26b2468a1e73870ce440f0f41de0c14ed3ee3e8b # Parent 2cb79b8a1aea4edb4b6f34da4c1e60a2ad350be6 [etwist] cleanup, use cProfile instead of hotshot diff -r 2cb79b8a1aea -r 26b2468a1e73 etwist/server.py --- a/etwist/server.py Fri Mar 19 14:43:15 2010 +0100 +++ b/etwist/server.py Fri Mar 19 14:43:49 2010 +0100 @@ -11,7 +11,6 @@ import os import select import errno -import hotshot from time import mktime from datetime import date, timedelta from urlparse import urlsplit, urlunsplit @@ -113,8 +112,6 @@ if config.repo_method == 'inmemory': reactor.addSystemEventTrigger('before', 'shutdown', self.shutdown_event) - # monkey patch start_looping_task to get proper reactor integration - #self.appli.repo.__class__.start_looping_tasks = start_looping_tasks if config.pyro_enabled(): # if pyro is enabled, we have to register to the pyro name # server, create a pyro daemon, and create a task to handle pyro @@ -496,7 +493,7 @@ root_resource.start_service() logger.info('instance started on %s', root_resource.base_url) if config['profile']: - prof = hotshot.Profile(config['profile']) - prof.runcall(reactor.run) + import cProfile + cProfile.runctx('reactor.run()', globals(), locals(), config['profile']) else: reactor.run()