MAAS

Merge lp:~allenap/maas/fix-wsgi-application-group into lp:~maas-committers/maas/trunk

  1. fix-wsgi-application-group
  2. Merge into trunk
Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 1695
Proposed branch: lp:~allenap/maas/fix-wsgi-application-group
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
contrib/maas-http.conf (+1/-1)
To merge this branch: bzr merge lp:~allenap/maas/fix-wsgi-application-group
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+190458@code.launchpad.net

Commit message

Import wsgi.py into the %{GLOBAL} application group to workaround bson encoding issue.

Previously it was being imported into the maas application group, which was causing bson to encode binary content as UTF-8 strings, probably due to an incompatibility with bson's C extension.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contrib/maas-http.conf'
2--- contrib/maas-http.conf 2012-11-12 14:32:26 +0000
3+++ contrib/maas-http.conf 2013-10-10 19:50:23 +0000
4@@ -8,7 +8,7 @@
5 WSGIScriptAlias /MAAS /usr/share/maas/wsgi.py
6 # Preload application when process starts. This will allow publishing
7 # the MAAS server existence over Avahi.
8-WSGIImportScript /usr/share/maas/wsgi.py process-group=maas application-group=maas
9+WSGIImportScript /usr/share/maas/wsgi.py process-group=maas application-group=%{GLOBAL}
10 WSGIPassAuthorization On
11
12 <Directory /usr/share/maas/>