Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Remove the lookaside email hook (rely on fedmsg now).

Browse source
This commit is contained in:
Ralph Bean 2015-03-24 14:41:16 +00:00
parent e4e432ff51
commit 04c59d4eee
1 changed files with 0 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

40
roles/distgit/files/dist-git-upload.cgi
View file

@ -18,12 +18,6 @@ import smtplib
import fedmsg import fedmsg
import fedmsg.config import fedmsg.config
from email import Header, Utils
try:
from email.mime.text import MIMEText
except ImportError:
from email.MIMEText import MIMEText
import hashlib import hashlib
# Reading buffer size # Reading buffer size
@ -59,39 +53,6 @@ def check_auth(username):
pass pass
return authenticated return authenticated
def send_email(pkg, checksum, filename, username):
text = """A file has been added to the lookaside cache for %(pkg)s:
%(checksum)s %(filename)s""" % locals()
msg = MIMEText(text)
try:
sender_name = pwd.getpwnam(username)[4]
sender_email = '%s@fedoraproject.org' % username
except KeyError:
sender_name = ''
sender_email = 'nobody@fedoraproject.org'
syslog.syslog('Unable to find account info for %s (uploading %s)' %
(username, filename))
if sender_name:
try:
sender_name = unicode(sender_name, 'ascii')
except UnicodeDecodeError:
sender_name = Header.Header(sender_name, 'utf-8').encode()
msg.set_charset('utf-8')
sender = Utils.formataddr((sender_name, sender_email))
recipients = ['%s-owner@fedoraproject.org' % pkg,
'scm-commits@lists.fedoraproject.org']
msg['Subject'] = 'File %s uploaded to lookaside cache by %s' % (
filename, username)
msg['From'] = sender
msg['To'] = ', '.join(recipients)
msg['X-Fedora-Upload'] = '%s, %s' % (pkg, filename)
try:
s = smtplib.SMTP('bastion')
s.sendmail(sender, recipients, msg.as_string())
except:
syslog.syslog('sending mail for upload of %s failed!' % filename)
def main(): def main():
os.umask(002) os.umask(002)
@ -218,7 +179,6 @@ def main():
print >> sys.stderr, '[username=%s] Stored %s (%d bytes)' % (username, dest_file, filesize) print >> sys.stderr, '[username=%s] Stored %s (%d bytes)' % (username, dest_file, filesize)
print 'File %s size %d %s %s stored OK' % (filename, filesize, hash_type.upper(), checksum) print 'File %s size %d %s %s stored OK' % (filename, filesize, hash_type.upper(), checksum)
send_email(name, checksum, filename, username)
# Emit a fedmsg message. Load the config to talk to the fedmsg-relay. # Emit a fedmsg message. Load the config to talk to the fedmsg-relay.
try: try: