crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

statistiques2.py: templating

Browse source 
On répare l'envoi de mail au passage
This commit is contained in:
Daniel STAN 2014-07-22 13:46:46 +02:00
parent 22d5baae1e
commit ce5dfc7ea6
7 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gestion/mail/template/upload_stats/From/fr Normal file
View file

@ -0,0 +1 @@
{{from}}

1
gestion/mail/template/upload_stats/README Normal file
View file

@ -0,0 +1 @@
Envoyé à disconnect chaque jour

1
gestion/mail/template/upload_stats/Subject/fr Normal file
View file

@ -0,0 +1 @@
Statistiques d'upload

1
gestion/mail/template/upload_stats/To/fr Normal file
View file

@ -0,0 +1 @@
{{to}}

1
gestion/mail/template/upload_stats/X-Mailer/fr Normal file
View file

@ -0,0 +1 @@
{{ mailer }}

6
gestion/mail/template/upload_stats/body/fr Normal file
View file

@ -0,0 +1,6 @@
Upload des serveurs (à partir de {{seuil_upload}})
{{upload_srv}}
--
Disconnect team

27
surveillance/statistiques2.py
View file

@ -23,6 +23,7 @@ import psycopg2.extras
import smtplib
import gestion.config.upload as upload_config
import gestion.config as config
from gestion import mail as mail_module
ldap = lc_ldap.shortcuts.lc_ldap_readonly()
encoding = "UTF-8"
@ -189,27 +190,17 @@ if __name__ == "__main__":
if args.mail:
expediteur = "disconnect@crans.org"
destinataire = "disconnect@crans.org"
message = """From: %(From)s
To: %(To)s
Subject: Statistiques des =?utf-8?q?derni=C3=A8res?= 24h
X-Mailer: /usr/scripts/surveillance/statistiques.py
Content-Type: text/plain; charset="utf-8"
Upload des serveurs (à partir de %(seuil_upload)s)
%(upload_srv)s
--
statistiques.py
"""
corps = message % {
'From': expediteur,
'To': destinataire,
# Testing purpose:
# destinataire = "your.mail@crans.org"
corps = mail_module.generate('upload_stats',
{
'from': expediteur,
'to': destinataire,
'upload_srv': fetched_upload_srv,
'seuil_upload': upload_config.pretty_seuil,
}
}).as_string()
mail = smtplib.SMTP('localhost')
mail.sendmail(expediteur, expediteur, corps)
mail.sendmail(expediteur, destinataire, corps)
else:
print fetched_upload_srv