forked from ticketfrei/ticketfrei
omit bare except.
This commit is contained in:
parent
4981223ee8
commit
bfc311b6c9
|
@ -21,7 +21,7 @@ class MastodonBot(Bot):
|
|||
m = Mastodon(*user.get_masto_credentials())
|
||||
try:
|
||||
notifications = m.notifications()
|
||||
except: # mastodon.Mastodon.MastodonAPIError is unfortunately not in __init__.py
|
||||
except Exception:
|
||||
logger.error("Unknown Mastodon API Error.", exc_info=True)
|
||||
return mentions
|
||||
for status in notifications:
|
||||
|
|
17
backend.py
17
backend.py
|
@ -4,7 +4,7 @@ import active_bots
|
|||
from config import config
|
||||
from db import db
|
||||
import logging
|
||||
import sendmail
|
||||
from sendmail import sendmail
|
||||
import time
|
||||
|
||||
|
||||
|
@ -30,12 +30,9 @@ if __name__ == '__main__':
|
|||
for bot2 in bots:
|
||||
bot2.post(user, status)
|
||||
time.sleep(60) # twitter rate limit >.<
|
||||
except:
|
||||
logger.error('Shutdown', exc_info=True)
|
||||
mailer = sendmail.Mailer()
|
||||
try:
|
||||
mailer.send('', config['web']['contact'],
|
||||
'Ticketfrei Crash Report',
|
||||
attachment=config['logging']['logpath'])
|
||||
except:
|
||||
logger.error('Mail sending failed', exc_info=True)
|
||||
except Exception:
|
||||
logger.error('Shutdown.', exc_info=True)
|
||||
try:
|
||||
sendmail(config['web']['contact'], 'Ticketfrei Shutdown')
|
||||
except Exception:
|
||||
logger.error('Could not inform admin.', exc_info=True)
|
||||
|
|
|
@ -150,7 +150,7 @@ def login_mastodon(user):
|
|||
return dict(
|
||||
info='Thanks for supporting decentralized social networks!'
|
||||
)
|
||||
except:
|
||||
except Exception:
|
||||
logger.error('Login to Mastodon failed.', exc_info=True)
|
||||
return dict(error='Login to Mastodon failed.')
|
||||
|
||||
|
|
|
@ -64,7 +64,7 @@ class Mailer(object):
|
|||
return "Sent mail to " + recipient + ": " + subject
|
||||
|
||||
|
||||
def sendmail(to, subject, body):
|
||||
def sendmail(to, subject, body=''):
|
||||
msg = MIMEMultipart()
|
||||
msg['From'] = '%s@%s' % (getuser(), getfqdn())
|
||||
msg['To'] = to
|
||||
|
|
Loading…
Reference in a new issue