Also update frestart

I guess I lied, that wasn't my last commit for today.
This commit is contained in:
nyuszika7h 2015-02-27 20:58:14 +01:00
parent 0bbfee91f4
commit 81ae2e7516

View File

@ -430,34 +430,38 @@ def forced_exit(cli, nick, chan, rest):
def restart_program(cli, nick, chan, rest): def restart_program(cli, nick, chan, rest):
"""Restarts the bot.""" """Restarts the bot."""
try: if var.PHASE in ("day", "night"):
if var.PHASE in ("day", "night"): try:
try: stop_game(cli)
stop_game(cli) except Exception:
except: notify_error(cli, chan, errlog)
errlog(traceback.format_exc())
url = pastebin(traceback.format_exc()) try:
cli.msg(chan, "An error has occurred and has been logged.{0}" reset_modes_timers(cli)
.format((" " + url) if url else "")) except Exception:
reset_modes_timers(cli) notify_error(cli, chan, errlog)
reset()
else: try:
reset_modes_timers(cli) reset()
reset() except Exception:
notify_error(cli, chan, errlog)
try:
cli.quit("Forced restart from {0}".format(nick))
except Exception:
notify_error(cli, chan, errlog)
plog("RESTARTING")
python = sys.executable
if rest.strip().lower() == "debugmode":
os.execl(python, python, sys.argv[0], "--debug")
elif rest.strip().lower() == "normalmode":
os.execl(python, python, sys.argv[0], "--normal")
elif rest.strip().lower() == "verbosemode":
os.execl(python, python, sys.argv[0], "--verbose")
else:
os.execl(python, python, *sys.argv)
cli.quit("Forced restart from "+nick)
raise SystemExit
finally:
plog("RESTARTING")
python = sys.executable
if rest.strip().lower() == "debugmode":
os.execl(python, python, sys.argv[0], "--debug")
elif rest.strip().lower() == "normalmode":
os.execl(python, python, sys.argv[0], "--normal")
elif rest.strip().lower() == "verbosemode":
os.execl(python, python, sys.argv[0], "--verbose")
else:
os.execl(python, python, *sys.argv)
@cmd("ping", pm=True) @cmd("ping", pm=True)
def pinger(cli, nick, chan, rest): def pinger(cli, nick, chan, rest):