fedora_elections/__init__.py | 7 +++++--
files/fedora-elections.spec | 7 ++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 59260e679031a3a8d05d345f7812b1858bb6a7b8
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Tue Nov 25 16:17:21 2014 +0100
Release 2.4.2
diff --git a/fedora_elections/__init__.py b/fedora_elections/__init__.py
index 7ffd58a..8e301a9 100644
--- a/fedora_elections/__init__.py
+++ b/fedora_elections/__init__.py
@@ -24,7 +24,7 @@
# Pierre-Yves Chibon <pingou(a)fedoraproject.org>
#
-__version__ = '2.4.1'
+__version__ = '2.4.2'
import logging
import os
diff --git a/files/fedora-elections.spec b/files/fedora-elections.spec
index e159b06..4a12d5c 100644
--- a/files/fedora-elections.spec
+++ b/files/fedora-elections.spec
@@ -1,7 +1,7 @@
%define modname fedora_elections
Name: fedora-elections
-Version: 2.4.1
+Version: 2.4.2
Release: 1%{?dist}
Summary: Fedora elections application
@@ -111,6 +111,11 @@ install -m 644 files/update_1_to_2.sql \
%changelog
+* Tue Nov 25 2014 Pierre-Yves Chibon <pingou(a)pingoured.fr> - 2.4.2-1
+- Update to 2.4.2
+- Fix logging so that we log into apache's logs and email when having an
+ error
+
* Thu Nov 20 2014 Pierre-Yves Chibon <pingou(a)pingoured.fr> - 2.4.1-1
- Update to 2.4.1
- Adjust the election form to inform the user that cla_done is always required
commit 122de666d50a894411bd5b081b6ba7300e4b3d2c
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Tue Nov 25 16:16:36 2014 +0100
Fix import and typo due to copy/paste
diff --git a/fedora_elections/__init__.py b/fedora_elections/__init__.py
index 74ca25e..7ffd58a 100644
--- a/fedora_elections/__init__.py
+++ b/fedora_elections/__init__.py
@@ -26,7 +26,9 @@
__version__ = '2.4.1'
+import logging
import os
+import sys
from datetime import datetime, time
from functools import wraps
@@ -41,6 +43,7 @@ from flask.ext.fas_openid import FAS
import dogpile.cache
import fedora_elections.fedmsgshim
+import fedora_elections.mail_logging
import fedora_elections.proxy
APP = flask.Flask(__name__)
@@ -53,7 +56,7 @@ FAS = FAS(APP)
# Set up the logging
if not APP.debug:
- APP.logger.addHandler(anitya.mail_logging.get_mail_handler(
+ APP.logger.addHandler(fedora_elections.mail_logging.get_mail_handler(
smtp_server=APP.config.get('SMTP_SERVER', '127.0.0.1'),
mail_admin=APP.config.get('MAIL_ADMIN', 'admin(a)fedoraproject.org')
))