matthias/infomentor
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enabled status information

Browse Source
This commit is contained in:
Matthias Bilger
2018-10-21 09:07:04 +02:00
parent 5d778e920c
commit b60e5a005d
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
infomentor/__main__.py
View File

@@ -107,7 +107,7 @@ def notify_users():
statusinfo['degraded_count'] = 1
if user.apistatus.ok == False and statusinfo['ok'] == False:
if user.apistatus.degraded_count == 1 and user.wantstatus:
send_status_update(user, statusinfo['info'])
im.send_status_update(statusinfo['info'])
try:
statusinfo['degraded_count'] = user.apistatus['degraded_count'] + 1
except Exception as e:
@@ -116,13 +116,11 @@ def notify_users():
statusinfo['info'] = 'Works as expected, failed {} times'.format(user.apistatus.degraded_count)
statusinfo['degraded_count'] = 0
if user.wantstatus:
send_status_update(user, statusinfo['info'])
im.send_status_update(statusinfo['info'])
user.apistatus.updateobj(statusinfo)
logger.info('New API status: %s', user.apistatus)
session.commit()
def send_status_update(user, text):
pass
def main():
args = parse_args(sys.argv[1:])

31
infomentor/informer.py
View File

@@ -15,6 +15,27 @@ class Informer(object):
self.user = user
self.im = im
def send_status_update(self, text):
try:
if self.user.notification.ntype == model.Notification.Types.PUSHOVER:
pushover.Client(self.user.notification.info).send_message(
text,
title='Status Infomentor',
html=False,
)
elif self.user.notification.ntype == model.Notification.Types.EMAIL:
mail = MIMEText(text)
mail['Subject'] = f'Status Infomentor'
mail['From'] = 'infomentor@09a.de'
mail['To'] = self.user.notification.info
self._send_mail(mail)
except:
mail = MIMEText("Fehler bei Infomentor")
mail['Subject'] = f'Fehler bei infomentor'
mail['From'] = 'infomentor@09a.de'
mail['To'] = 'matthias@bilger.info'
self._send_mail(mail)
def update_news(self):
session = db.get_db()
newslist = self.im.get_news_list()
@@ -107,10 +128,7 @@ class Informer(object):
encoders.encode_base64(msg)
msg.add_header('Content-Disposition', 'attachment', filename=fname)
outer.attach(msg)
s = smtplib.SMTP_SSL('09a.de')
s.login('infomentor@09a.de', '***REMOVED***')
s.send_message(outer)
s.quit()
self._send_mail(outer)
def update_homework(self):
session = db.get_db()
@@ -181,7 +199,10 @@ class Informer(object):
encoders.encode_base64(msg)
msg.add_header('Content-Disposition', 'attachment', filename=fname)
outer.attach(msg)
self._send_mail(outer)
def _send_mail(self, mail):
s = smtplib.SMTP_SSL('09a.de')
s.login('infomentor@09a.de', '***REMOVED***')
s.send_message(outer)
s.send_message(mail)
s.quit()