marcel/survBot
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 1 Wiki Activity

[update] add external mail list for detailed specification of info mail recipients

Browse Source
This commit is contained in:
Marcel Paffrath 2023-01-31 16:12:07 +01:00
parent c736048811
commit 3a384fd7b5
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parameters.yaml
View File

@ -129,3 +129,5 @@ EMAIL:
sender: "webmaster@geophysik.ruhr-uni-bochum.de" # mail sender sender: "webmaster@geophysik.ruhr-uni-bochum.de" # mail sender
stations_blacklist: ['GR33'] # do not send emails for specific stations stations_blacklist: ['GR33'] # do not send emails for specific stations
networks_blacklist: [] # do not send emails for specific network networks_blacklist: [] # do not send emails for specific network
# specify recipients for single stations in a yaml: key = email-address, val = station list (e.g. [1Y.GR01, 1Y.GR02])
external_mail_list: "mailing_list.yaml"

30
survBot.py
View File

@ -5,6 +5,7 @@ __version__ = '0.1'
__author__ = 'Marcel Paffrath' __author__ = 'Marcel Paffrath'
import os import os
import copy
import traceback import traceback
import yaml import yaml
import argparse import argparse
@ -501,7 +502,8 @@ class StationQC(object):
self.network = nsl.get('network') self.network = nsl.get('network')
self.station = nsl.get('station') self.station = nsl.get('station')
self.location = nsl.get('location') self.location = nsl.get('location')
self.parameters = parameters # make a copy of parameters object to prevent accidental changes
self.parameters = copy.deepcopy(parameters)
self.program_starttime = starttime self.program_starttime = starttime
self.verbosity = verbosity self.verbosity = verbosity
self.last_active = False self.last_active = False
@ -639,10 +641,14 @@ class StationQC(object):
sender = mail_params.get('sender') sender = mail_params.get('sender')
addresses = mail_params.get('addresses') addresses = mail_params.get('addresses')
add_addresses = self.get_additional_mail_recipients(mail_params)
if add_addresses:
# create copy of addresses ( [:] ) to prevent changing original, general list with addresses
addresses = addresses[:] + list(add_addresses)
server = mail_params.get('mailserver') server = mail_params.get('mailserver')
if not sender or not addresses: if not sender or not addresses:
if self.verbosity: if self.verbosity:
print('Mail sender or addresses not correctly defined. Return') print('Mail sender or addresses not (correctly) defined. Return')
return return
dt = self.get_dt_for_action() dt = self.get_dt_for_action()
text = f'{key}: Status {status_type} longer than {dt}: ' + additional_message text = f'{key}: Status {status_type} longer than {dt}: ' + additional_message
@ -653,9 +659,27 @@ class StationQC(object):
# send message via SMTP server # send message via SMTP server
s = smtplib.SMTP(server) s = smtplib.SMTP(server)
s.sendmail(sender, addresses, msg.as_string()) s.send_message(msg)
s.quit() s.quit()
def get_additional_mail_recipients(self, mail_params):
""" return additional recipients from external mail list if this station (self.nwst_id) is specified """
eml_filename = mail_params.get('external_mail_list')
if not eml_filename:
return []
try:
with open(eml_filename) as fid:
address_dict = yaml.safe_load(fid)
except FileNotFoundError as e:
if self.verbosity:
print(e)
if not isinstance(address_dict, dict):
if self.verbosity:
print(f'Could not read dictionary from file {eml_filename}')
for address, nwst_ids in address_dict.items():
if self.nwst_id in nwst_ids:
yield address
def get_dt_for_action(self): def get_dt_for_action(self):
n_track = self.parameters.get('n_track') n_track = self.parameters.get('n_track')
interval = self.parameters.get('interval') interval = self.parameters.get('interval')