Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Don't print BitBotPanic stacks when we don't need to

Browse source
This commit is contained in:
jesopo 2019-06-23 10:01:15 +01:00
parent 7861210495
commit afc287f020
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/IRCBot.py
View file

@ -104,20 +104,15 @@ class Bot(object):
elif type == TriggerResult.Return: elif type == TriggerResult.Return:
return returned return returned
def panic(self, reason=None): def panic(self, reason=None, throw=True):
callback = None callback = None
if not reason == None: if not reason == None:
self.log.critical("panic() called: %s", [reason]) self.log.critical("panic() called: %s", [reason], exc_info=True)
exception = sys.exc_info()[1] self._event_queue.put(TriggerEvent(TriggerEventType.Kill))
if exception: if throw:
def _raise(): raise BitBotPanic()
raise exception
callback = _raise
self._event_queue.put(TriggerEvent(TriggerEventType.Kill, callback))
raise BitBotPanic()
def load_modules(self, safe: bool=False def load_modules(self, safe: bool=False
) -> typing.Tuple[typing.List[str], typing.List[str]]: ) -> typing.Tuple[typing.List[str], typing.List[str]]:
@ -257,6 +252,11 @@ class Bot(object):
return thread return thread
def run(self): def run(self):
try:
self._run()
except BitBotPanic:
return
def _run(self):
self.running = True self.running = True
self._read_thread = self._daemon_thread( self._read_thread = self._daemon_thread(
lambda: self._loop_catch("read", self._read_loop)) lambda: self._loop_catch("read", self._read_loop))
@ -300,7 +300,7 @@ class Bot(object):
except BitBotPanic: except BitBotPanic:
return return
except Exception as e: except Exception as e:
self.panic("Exception on '%s' thread" % name) self.panic("Exception on '%s' thread" % name, throw=False)
def _write_loop(self): def _write_loop(self):
while self.running: while self.running: