From 4c50c69fbb4ab79e359a3d9325cefc41e12dc285 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 23 Jan 2013 08:49:00 -0600 Subject: [PATCH] fixed gevent monkey patching problem, thank you JimK --- VERSION | 2 +- anyserver.py | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index 723d8c16..fb34ff20 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2013.01.23.08.17.15 +Version 2.4.1-alpha.2+timestamp.2013.01.23.08.48.16 diff --git a/anyserver.py b/anyserver.py index ebf556c8..dc0263b1 100644 --- a/anyserver.py +++ b/anyserver.py @@ -17,8 +17,6 @@ import urllib path = os.path.dirname(os.path.abspath(__file__)) os.chdir(path) sys.path = [path] + [p for p in sys.path if not p == path] -import gluon.main -from gluon.fileutils import read_file, write_file class Servers: @@ -92,8 +90,6 @@ class Servers: @staticmethod def gevent(app, address, **options): - from gevent import monkey - monkey.patch_all() from gevent import pywsgi from gevent.pool import Pool pywsgi.WSGIServer(address, app, spawn='workers' in options and Pool( @@ -181,6 +177,12 @@ class Servers: s.start() def run(servername, ip, port, softcron=True, logging=False, profiler=None): + if servername == 'gevent': + from gevent import monkey + monkey.patch_all() + + import gluon.main + if logging: application = gluon.main.appfactory(wsgiapp=gluon.main.wsgibase, logfilename='httpserver.log', @@ -301,7 +303,7 @@ def mongrel2_handler(application, conn, debug=False): def main(): usage = "python anyserver.py -s tornado -i 127.0.0.1 -p 8000 -l -P" try: - version = read_file('VERSION') + version = open('VERSION','r') except IOError: version = '' parser = optparse.OptionParser(usage, None, optparse.Option, version)