e13edc60a0c6486b8b4ad715e12683b28f6eb166 max Tue Feb 26 02:59:37 2019 -0800 fix debug messages and bot delay system in hgGeneGraph, refs #22999 diff --git src/hg/pyLib/hgLib.py src/hg/pyLib/hgLib.py index 9741f94..add7004 100644 --- src/hg/pyLib/hgLib.py +++ src/hg/pyLib/hgLib.py @@ -387,31 +387,31 @@ Using the hgsid makes little sense. It is more lenient than the C version. """ import time if "DOCUMENT_ROOT" not in os.environ: # skip if not called from Apache return global hgConf global botDelay hgConf = parseHgConf() if "bottleneck.host" not in hgConf: return ip = os.environ["REMOTE_ADDR"] delay = queryBottleneck(hgConf["bottleneck.host"], hgConf["bottleneck.port"], ip) debug(1, "Bottleneck delay: %d msecs" % delay) if delay>1000: time.sleep(delay/1000.0) - botDelay = delay + botDelay = delay # show warning message in printContentType() if delay>5000: errAbort("Too many HTTP requests. Your IP has been blocked to keep this website responsive for other users. " "Please contact genome-www@soe.ucsc.edu to unblock your IP address. We can also help you obtain the data you need without " "web crawling. ") sys.exit(0) def parseRa(text): " Parse ra-style string and return as dict name -> value " import string lines = text.split("\n") data = dict() for l in lines: if len(l)==0: continue