R-2.6.4
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.6.4-stable+timestamp.2013.09.21.20.23.38
|
Version 2.6.4-stable+timestamp.2013.09.21.20.41.28
|
||||||
|
|||||||
+6
-4
@@ -608,7 +608,8 @@ def save_password(password, port):
|
|||||||
|
|
||||||
def appfactory(wsgiapp=wsgibase,
|
def appfactory(wsgiapp=wsgibase,
|
||||||
logfilename='httpserver.log',
|
logfilename='httpserver.log',
|
||||||
profiler_dir=None):
|
profiler_dir=None,
|
||||||
|
profilerfilename=None):
|
||||||
"""
|
"""
|
||||||
generates a wsgi application that does logging and profiling and calls
|
generates a wsgi application that does logging and profiling and calls
|
||||||
wsgibase
|
wsgibase
|
||||||
@@ -619,7 +620,8 @@ def appfactory(wsgiapp=wsgibase,
|
|||||||
[, profilerfilename='profiler.log']]])
|
[, profilerfilename='profiler.log']]])
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
if profilerfilename is not None:
|
||||||
|
raise BaseException("Deprecated API")
|
||||||
if profiler_dir:
|
if profiler_dir:
|
||||||
profiler_dir = abspath(profiler_dir)
|
profiler_dir = abspath(profiler_dir)
|
||||||
logger.warn('profiler is on. will use dir %s', profiler_dir)
|
logger.warn('profiler is on. will use dir %s', profiler_dir)
|
||||||
@@ -627,14 +629,14 @@ def appfactory(wsgiapp=wsgibase,
|
|||||||
try:
|
try:
|
||||||
os.makedirs(profiler_dir)
|
os.makedirs(profiler_dir)
|
||||||
except:
|
except:
|
||||||
raise BaseException, "Can't create dir %s" % profiler_dir
|
raise BaseException("Can't create dir %s" % profiler_dir)
|
||||||
filepath = pjoin(profiler_dir, 'wtest')
|
filepath = pjoin(profiler_dir, 'wtest')
|
||||||
try:
|
try:
|
||||||
filehandle = open( filepath, 'w' )
|
filehandle = open( filepath, 'w' )
|
||||||
filehandle.close()
|
filehandle.close()
|
||||||
os.unlink(filepath)
|
os.unlink(filepath)
|
||||||
except IOError:
|
except IOError:
|
||||||
raise BaseException, "Unable to write to dir %s" % profiler_dir
|
raise BaseException("Unable to write to dir %s" % profiler_dir)
|
||||||
|
|
||||||
def app_with_logging(environ, responder):
|
def app_with_logging(environ, responder):
|
||||||
"""
|
"""
|
||||||
|
|||||||
Reference in New Issue
Block a user