jab2870/PappyProxy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Version 0.2.3

Browse source
This commit is contained in:
Rob Glew 2016-01-27 16:51:40 -06:00
parent 28b7b7e8ff
commit d805eabeec
15 changed files with 559 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pappyproxy/pappy.py
View file

@ -67,7 +67,6 @@ def main():
global plugin_loader
global cons
settings = parse_args()
load_start = datetime.datetime.now()
if settings['lite']:
conf_settings = config.get_default_config()
@ -100,7 +99,7 @@ def main():
print 'Exiting...'
reactor.stop()
http.init(dbpool)
yield requestcache.RequestCache.load_ids()
yield http.Request.cache.load_ids()
context.reset_context_caches()
# Run the proxy
@ -136,13 +135,6 @@ def main():
yield context.load_scope(http.dbpool)
context.reset_to_scope(main_context)
# Apologize for slow start times
load_end = datetime.datetime.now()
load_time = (load_end - load_start)
if load_time.total_seconds() > 20:
print 'Startup was slow (%s)! Sorry!' % load_time
print 'Database has {0} requests (~{1:.2f}ms per request)'.format(len(main_context.active_requests), ((load_time.total_seconds()/len(main_context.active_requests))*1000))
sys.argv = [sys.argv[0]] # cmd2 tries to parse args
cons = ProxyCmd()
plugin_loader = plugin.PluginLoader(cons)