fixed gevent monkey patching problem, thank you JimK
This commit is contained in:
@@ -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
|
||||||
|
|||||||
+7
-5
@@ -17,8 +17,6 @@ import urllib
|
|||||||
path = os.path.dirname(os.path.abspath(__file__))
|
path = os.path.dirname(os.path.abspath(__file__))
|
||||||
os.chdir(path)
|
os.chdir(path)
|
||||||
sys.path = [path] + [p for p in sys.path if not p == 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:
|
class Servers:
|
||||||
@@ -92,8 +90,6 @@ class Servers:
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def gevent(app, address, **options):
|
def gevent(app, address, **options):
|
||||||
from gevent import monkey
|
|
||||||
monkey.patch_all()
|
|
||||||
from gevent import pywsgi
|
from gevent import pywsgi
|
||||||
from gevent.pool import Pool
|
from gevent.pool import Pool
|
||||||
pywsgi.WSGIServer(address, app, spawn='workers' in options and Pool(
|
pywsgi.WSGIServer(address, app, spawn='workers' in options and Pool(
|
||||||
@@ -181,6 +177,12 @@ class Servers:
|
|||||||
s.start()
|
s.start()
|
||||||
|
|
||||||
def run(servername, ip, port, softcron=True, logging=False, profiler=None):
|
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:
|
if logging:
|
||||||
application = gluon.main.appfactory(wsgiapp=gluon.main.wsgibase,
|
application = gluon.main.appfactory(wsgiapp=gluon.main.wsgibase,
|
||||||
logfilename='httpserver.log',
|
logfilename='httpserver.log',
|
||||||
@@ -301,7 +303,7 @@ def mongrel2_handler(application, conn, debug=False):
|
|||||||
def main():
|
def main():
|
||||||
usage = "python anyserver.py -s tornado -i 127.0.0.1 -p 8000 -l -P"
|
usage = "python anyserver.py -s tornado -i 127.0.0.1 -p 8000 -l -P"
|
||||||
try:
|
try:
|
||||||
version = read_file('VERSION')
|
version = open('VERSION','r')
|
||||||
except IOError:
|
except IOError:
|
||||||
version = ''
|
version = ''
|
||||||
parser = optparse.OptionParser(usage, None, optparse.Option, version)
|
parser = optparse.OptionParser(usage, None, optparse.Option, version)
|
||||||
|
|||||||
Reference in New Issue
Block a user