zephyr_mirror: Get rid of extra_mirror code -- it is no longer used.
(imported from commit ab2a9cfcfa6a8c7615523ebb16864e9a4db05f3a)
This commit is contained in:
parent
ff80f7df71
commit
99f90762d3
|
@ -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,9 +740,6 @@ 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 = "extra_mirror.py"
|
|
||||||
else:
|
|
||||||
bot_name = "zephyr_mirror.py"
|
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],
|
||||||
|
|
Loading…
Reference in a new issue