Merge lp:~michael.nelson/ubuntu-webcatalog/rt-61147-nagios-sca-import-dict-config into lp:ubuntu-webcatalog

[Michael Nelson]

Update logging dictConfig for use in deployments and add a specific logger for import_sca_apps.

This is to fix RT 61147 - just to verify the new config (well, ensure that the dev env uses the same setup) which is used in the separate config branch at:

https://code.launchpad.net/~michael.nelson/ca-configs/uwc-add-sca-import-logging-dict-config/+merge/182429

[James Westby (james-w)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2013-02-28 16:23:58 +0000
+++ .bzrignore	2013-08-27 15:27:42 +0000
@@ -16,3 +16,4 @@
 django_project/local.cfg
 django_project/sreclient.py
 oopses/
+tmp/*

=== modified file 'django_project/config/main.cfg'
--- django_project/config/main.cfg	2013-04-26 14:24:42 +0000
+++ django_project/config/main.cfg	2013-08-27 15:27:42 +0000
@@ -79,23 +79,49 @@
 handlers = django_logging_handlers
 loggers = django_logging_loggers
 root = django_logging_root
+formatters = django_logging_formatters
 
 [django_logging_root]
 level = WARNING
 
 [django_logging_loggers]
 django = django_logger
+webcatalog.management.commands.import_sca_apps = import_sca_logger
 
 [django_logger]
-handlers = null
-level = WARNING
+handlers = webapp
+level = INFO
 
 [django_logging_handlers]
-null = django_null_logging_handler
-
-[django_null_logging_handler]
-level = WARNING
-class = django.utils.log.NullHandler
+webapp = webapp_logging_handler
+importer = import_sca_apps_handler
+
+[webapp_logging_handler]
+class = logging.handlers.WatchedFileHandler
+level = INFO
+formatter = simple
+filename = ./tmp/webapp.log
+
+[import_sca_apps_handler]
+class = logging.handlers.WatchedFileHandler
+level = INFO
+formatter = simple_no_name
+filename = ./tmp/import_sca_apps.log
+
+[import_sca_logger]
+handlers = importer
+propagate = false
+level = INFO
+
+[django_logging_formatters]
+simple = django_logging_simple_format
+simple_no_name = django_logging_simple_no_name_format
+
+[django_logging_simple_format]
+format = %%(asctime)s - %%(name)s - %%(levelname)s - %%(message)s
+
+[django_logging_simple_no_name_format]
+format = %%(asctime)s - %%(levelname)s - %%(message)s
 
 [openid]
 openid_sso_server_url = https://login.staging.ubuntu.com

=== modified file 'src/webcatalog/management/commands/import_exhibits.py'
--- src/webcatalog/management/commands/import_exhibits.py	2012-08-20 15:34:18 +0000
+++ src/webcatalog/management/commands/import_exhibits.py	2013-08-27 15:27:42 +0000
@@ -81,4 +81,4 @@
         # Unpublish other exhibits
         Exhibit.objects.filter(published=True).exclude(
             sca_id__in=[xibit['id'] for xibit in exhibits]).update(
-                published=False)
+            published=False)

=== modified file 'src/webcatalog/management/commands/import_sca_apps.py'
--- src/webcatalog/management/commands/import_sca_apps.py	2012-08-21 13:57:11 +0000
+++ src/webcatalog/management/commands/import_sca_apps.py	2013-08-27 15:27:42 +0000
@@ -22,6 +22,7 @@
 from __future__ import absolute_import
 
 import json
+import logging
 import os
 import urllib
 from collections import defaultdict
@@ -42,12 +43,15 @@
 __all__ = []
 
 
+logger = logging.getLogger(__name__)
+
+
 class Command(BaseCommand):
     help = "Import for-purchase applications from Software Center."
-    verbosity = 0
 
     def handle(self, *args, **options):
         url = '%sapplications/any/ubuntu/any/any/' % settings.SCA_API_URL
+        logger.info("Starting import of sca apps at {0}".format(url))
         # call api and get apps for purchase
         response = urllib.urlopen(url)
         if response.code != 200:
@@ -55,8 +59,8 @@
         app_list = json.loads(response.read())
         imported_apps = Application.objects.filter(
             imported_from_sca=True).values_list(
-                'package_name',
-                'distroseries__code_name')
+            'package_name',
+            'distroseries__code_name')
         existing_apps = defaultdict(list)
         for package_name, code_name in imported_apps:
             existing_apps[package_name].append(code_name)
@@ -71,7 +75,7 @@
                 distroseries, created = DistroSeries.objects.get_or_create(
                     code_name=series_name)
                 if created:
-                    self.output(
+                    logger.info(
                         "Created a DistroSeries record called '{0}'.\n".format(
                             series_name), 1)
                 package_name = self.import_app_from_data(
@@ -91,6 +95,7 @@
             Application.objects.filter(
                 package_name=package_name,
                 distroseries__code_name__in=series).delete()
+        logger.info("Finished import of {0} sca apps.".format(len(app_list)))
 
     def import_app_from_data(self, app_data, icon_data, distroseries):
         form = SCAApplicationForm.from_api_data(
@@ -100,7 +105,6 @@
             department_names = app_data.get('department', [])
             app.update_departments(department_names)
             self.add_icon_to_app(app, data=icon_data)
-            self.output(u"{0} created.\n".format(app.name).encode('utf-8'), 1)
         return app.package_name
 
     def get_icon_data(self, app_data):
@@ -125,10 +129,3 @@
         finally:
             if os.path.exists(filename):
                 os.unlink(filename)
-
-    def output(self, message, level=None, flush=False):
-        if hasattr(self, 'stdout'):
-            if level is None or self.verbosity >= level:
-                self.stdout.write(message)
-            if flush:
-                self.stdout.flush()

=== modified file 'src/webcatalog/schema.py'
--- src/webcatalog/schema.py	2013-04-09 13:26:31 +0000
+++ src/webcatalog/schema.py	2013-08-27 15:27:42 +0000
@@ -80,9 +80,6 @@
         google_analytics_id = schema.StringOption()
         secondary_google_analytics_id = schema.StringOption()
 
-    class logging(schema.Section):
-        webapp_logging_config = schema.StringOption()
-
     class preflight(schema.Section):
         preflight_base_template = schema.StringOption(
             default="webcatalog/base.html")

=== modified file 'src/webcatalog/templatetags/webcatalog.py'
--- src/webcatalog/templatetags/webcatalog.py	2013-02-22 21:02:05 +0000
+++ src/webcatalog/templatetags/webcatalog.py	2013-08-27 15:27:42 +0000
@@ -79,8 +79,8 @@
                 '{application_name} is also available for '
                 '<a href="{app_in_series_url}">your version of '
                 'Ubuntu</a>.').format(
-                    application_name=escape(application.name),
-                    app_in_series_url=app_in_series_url)
+                application_name=escape(application.name),
+                app_in_series_url=app_in_series_url)
             context['message_text'] = mark_safe(
                 context['message_text'])
             return context

=== modified file 'src/webcatalog/wsgi.py'
--- src/webcatalog/wsgi.py	2013-02-28 16:23:58 +0000
+++ src/webcatalog/wsgi.py	2013-08-27 15:27:42 +0000
@@ -17,12 +17,10 @@
 
 """wsgi stack for the Apps Directory."""
 
-import logging.config
 import oops_dictconfig
 import oops_wsgi
 import oops_wsgi.django
 import os
-import platform
 import uuid
 
 from django.conf import settings
@@ -64,12 +62,6 @@
     if settings.SHOULD_SERVE_HTTPS:
         os.environ['HTTPS'] = 'on'
 
-    default_id = ''.join(x for x in platform.node() if x.isalpha())
-    appserver_id = getattr(settings, 'APPSERVER_ID', default_id)
-    logging_config = settings.WEBAPP_LOGGING_CONFIG
-    if logging_config:
-        logging.config.fileConfig(logging_config)
-
     non_oops_app = EagerOOPSWSGIHandler()
 
     config = oops_dictconfig.config_from_dict(settings.OOPSES)

=== added directory 'tmp'