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

zephyr_mirror: Get rid of extra_mirror code -- it is no longer used.

Browse source 
(imported from commit ab2a9cfcfa6a8c7615523ebb16864e9a4db05f3a)
This commit is contained in:
Tim Abbott 2012-11-19 11:48:00 -05:00
parent ff80f7df71
commit 99f90762d3
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bots/zephyr_mirror.py
View file

@ -162,8 +162,6 @@ def maybe_restart_mirroring_script():
logging.exception("") logging.exception("")
while True: while True:
try: try:
if bot_name == "extra_mirror.py":
os.execvp(os.path.join(options.root_path, "extra_mirror.py"), sys.argv)
os.execvp(os.path.join(options.root_path, "user_root", "zephyr_mirror.py"), sys.argv) os.execvp(os.path.join(options.root_path, "user_root", "zephyr_mirror.py"), sys.argv)
except: except:
logger.exception("Error restarting mirroring script; trying again... Traceback:") logger.exception("Error restarting mirroring script; trying again... Traceback:")
@ -742,10 +740,7 @@ or specify the --api-key-file option.""" % (options.api_key_file,)))
# First check that there are no other bots running # First check that there are no other bots running
cmdline = " ".join(sys.argv) cmdline = " ".join(sys.argv)
if "extra_mirror" in cmdline: bot_name = "zephyr_mirror.py"
bot_name = "extra_mirror.py"
else:
bot_name = "zephyr_mirror.py"
if not options.test_mode: if not options.test_mode:
proc = subprocess.Popen(['pgrep', '-U', os.environ["USER"], "-f", bot_name], proc = subprocess.Popen(['pgrep', '-U', os.environ["USER"], "-f", bot_name],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,