Ubuntu Apps Directory

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

  1. rt-61147-nagios-sca-import
  2. Merge into trunk
Proposed by Michael Nelson
Status: Rejected
Rejected by: Michael Nelson
Proposed branch: lp://staging/~michael.nelson/ubuntu-webcatalog/rt-61147-nagios-sca-import
Merge into: lp://staging/ubuntu-webcatalog
Diff against target: 242 lines (+55/-48)
8 files modified
.bzrignore (+1/-0)
django_project/config/main.cfg (+2/-24)
django_project/dev_logging.conf (+32/-0)
django_project/settings.py (+8/-1)
src/webcatalog/management/commands/import_exhibits.py (+1/-1)
src/webcatalog/management/commands/import_sca_apps.py (+9/-12)
src/webcatalog/templatetags/webcatalog.py (+2/-2)
src/webcatalog/wsgi.py (+0/-8)
To merge this branch: bzr merge lp://staging/~michael.nelson/ubuntu-webcatalog/rt-61147-nagios-sca-import
Reviewer Review Type Date Requested Status
Canonical Consumer Applications Hackers Pending
Review via email: mp+182091@code.staging.launchpad.net

Commit message

Switch to logging.config.fileConfig (as used in deployments) and add logger for import_sca_apps.

Description of the change

Switch to logging.config.fileConfig (as used in deployments) and add logger for import_sca_apps.

This is to fix RT 61147. Similar update of the deployed configs:

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

(it would be good to review the bracnhes together)

So I wasn't blindly updating the deployment logging config, I've updated the codebase to use the same logging config method (ie. from file). I hit one stumbling block (see the XXX), but otherwise works as expected.

To post a comment you must log in.

Unmerged revisions

189. By Michael Nelson

Removed other left-over logging config details.

188. By Michael Nelson

Switch to file-based logging config to match deployments.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches