From: Thomas Goirand <thomas@goirand.fr>
Date: Mon, 11 Jan 2016 03:32:16 +0000 (+0000)
Subject: Added do-not-use-django.utils.log.NullHandler.patch
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=852600de1700671c96f7b73609e36ea462e0be73;p=openstack-build%2Fhorizon-build.git

Added do-not-use-django.utils.log.NullHandler.patch

Rewritten-From: 9fbbe52f72a5d4c0f06b61889034a131277c5c38
---

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 6459e99..2626898 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,5 +1,6 @@
 horizon (2:8.0.0-4) unstable; urgency=medium
 
+  * Added do-not-use-django.utils.log.NullHandler.patch
   * Added do-not-use-importlib-from-django.patch.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 11 Jan 2016 02:54:28 +0000
diff --git a/trusty/debian/patches/do-not-use-django.utils.log.NullHandler.patch b/trusty/debian/patches/do-not-use-django.utils.log.NullHandler.patch
new file mode 100644
index 0000000..8711ad2
--- /dev/null
+++ b/trusty/debian/patches/do-not-use-django.utils.log.NullHandler.patch
@@ -0,0 +1,28 @@
+Description: Do not use django.utils.log.NullHandler
+ This was removed from Django 1.9
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2016-01-11
+
+--- horizon-8.0.0.orig/horizon/test/settings.py
++++ horizon-8.0.0/horizon/test/settings.py
+@@ -157,7 +157,7 @@ LOGGING = {
+     'handlers': {
+         'null': {
+             'level': 'DEBUG',
+-            'class': 'django.utils.log.NullHandler',
++            'class': 'logging.NullHandler',
+         },
+         'test': {
+             'level': 'ERROR',
+--- horizon-8.0.0.orig/openstack_dashboard/local/local_settings.py.example
++++ horizon-8.0.0/openstack_dashboard/local/local_settings.py.example
+@@ -395,7 +395,7 @@ LOGGING = {
+     'handlers': {
+         'null': {
+             'level': 'DEBUG',
+-            'class': 'django.utils.log.NullHandler',
++            'class': 'logging.NullHandler',
+         },
+         'console': {
+             # Set the level to "DEBUG" for verbose output logging.
diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 7f5f2d2..1f10cfe 100644
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -2,3 +2,4 @@ fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
 do-not-use-importlib-from-django.patch
+do-not-use-django.utils.log.NullHandler.patch