444eff44f7651c6c3029cb807a33012329f5dbcf max Thu Sep 26 03:02:23 2019 -0700 adding hogExit message when blocking IP to hgGeneGraph, refs #24094 diff --git src/hg/pyLib/hgLib.py src/hg/pyLib/hgLib.py index 4339242..a856e61 100644 --- src/hg/pyLib/hgLib.py +++ src/hg/pyLib/hgLib.py @@ -468,30 +468,31 @@ if not "bottleneck.host" or not "bottleneck.port" or not ip: return botCheckString = getBotCheckString(ip, fraction) millis = botDelayTime(host, port, botCheckString) debug(1, "Bottleneck delay: %d msecs" % millis) botDelayMsecs = millis if millis>botDelayBlock: # retry-after time factor 10 is based on the example in the bottleneck help message errAbort("Too many HTTP requests and not enough delay between them. " "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. ", status=429, headers = {"Retry-after" : str(millis / 10)}) + sys.stderr.write("hgLib.py hogExit\n") sys.exit(0) if millis>botDelayWarn: time.sleep(millis/1000.0) doWarnBot = True # = show warning message later in printContentType() 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 key, val = string.split(l, " ", maxsplit=1)