xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

zephyr_mirror: Send Humbugs in child processes.

Browse source 
This improves the throughput of mirroring a large number of zephyrs in
a row from about 1.5/second to about 9/second, which is basically
satisfactory.

(imported from commit 5f72680d6290eaa02ef8ced5b3792fb3efc1db41)
This commit is contained in:
Tim Abbott 2012-11-14 16:02:56 -05:00
parent ca351f3ddc
commit c751cc97db
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bots/zephyr_mirror.py
View file

@ -169,7 +169,7 @@ def process_loop(log):
if notice is not None: if notice is not None:
try: try:
process_notice(notice, log) process_notice(notice, log)
except: except Exception:
logger.exception("Error relaying zephyr:") logger.exception("Error relaying zephyr:")
time.sleep(2) time.sleep(2)
@ -255,9 +255,12 @@ def process_notice(notice, log):
log.write(simplejson.dumps(zeph) + '\n') log.write(simplejson.dumps(zeph) + '\n')
log.flush() log.flush()
res = send_humbug(zeph) if os.fork() == 0:
if res.get("result") != "success": # Actually send the message in a child process, to avoid blocking.
logger.error("Error relaying zephyr:\n%s\n%s" %(zeph, res)) res = send_humbug(zeph)
if res.get("result") != "success":
logger.error("Error relaying zephyr:\n%s\n%s" % (zeph, res))
sys.exit(0)
def decode_unicode_byte_strings(zeph): def decode_unicode_byte_strings(zeph):
for field in zeph.keys(): for field in zeph.keys():
@ -736,4 +739,6 @@ or specify the --api-key-file option.""" % (options.api_key_file,)))
traceback.print_exc() traceback.print_exc()
time.sleep(1) time.sleep(1)
logger = configure_logger("zephyr=>humbug") logger = configure_logger("zephyr=>humbug")
# Have the kernel reap children for when we fork off processes to send Humbugs
signal.signal(signal.SIGCHLD, signal.SIG_IGN)
zephyr_to_humbug(options) zephyr_to_humbug(options)