Merge lp:~canonical-isd-hackers/canonical-identity-provider/add-devserver into lp:canonical-identity-provider/release

[Łukasz Czyżykowski]

Add django-devserver to the project.

Overview
========
This branch adds django-devserver to the project.

Details
=======
The change includes:
- adding new items to the requirements.txt file: devserver itself and two of its optional dependencies,
- adding devserver's configuration variables to the schema,
- adding example and usable configuration for devserver to the devel-13.cfg config file
- adding new fabric task (devserver).

Testing
=======
To test this feature follow instructions in the README file and then run it by using:

    $ fab devserver

and use site. You should see SQL output as well as some other additional information.

[Ricardo Kirkner (ricardokirkner)]

Nice addition!

review: Approve

=== modified file 'django_project/config_dev/config/devel-13.cfg'
--- django_project/config_dev/config/devel-13.cfg	2011-06-28 14:47:35 +0000
+++ django_project/config_dev/config/devel-13.cfg	2011-07-12 13:52:37 +0000
@@ -14,6 +14,7 @@
     oauth_backend
     preflight
     gargoyle
+    devserver
 template_context_processors =
     django.contrib.auth.context_processors.auth
     django.core.context_processors.debug
@@ -48,3 +49,17 @@
 port = %(db_port)s
 
 [django_logging]
+
+[devserver]
+devserver_ignored_prefixes = /assets
+devserver_auto_profile = True
+devserver_modules = 
+    devserver.modules.sql.SQLRealTimeModule
+    devserver.modules.sql.SQLSummaryModule
+    devserver.modules.profile.ProfileSummaryModule
+    devserver.modules.cache.CacheSummaryModule
+    devserver.modules.profile.LineProfilerModule
+#     Modules not enabled by default
+#     devserver.modules.ajax.AjaxDumpModule
+#     devserver.modules.profile.MemoryUseModule
+#     devserver.modules.profile.LineProfilerModule
\ No newline at end of file

=== modified file 'identityprovider/schema.py'
--- identityprovider/schema.py	2011-06-28 14:47:54 +0000
+++ identityprovider/schema.py	2011-07-12 13:52:37 +0000
@@ -149,3 +149,16 @@
     profile.profile_pattern = StringConfigOption(
         default="identityprovider\..*",
         help="Regex pattern for limiting functions to be considered for profiling")
+
+    devserver = ConfigSection()
+    devserver.devserver_ignored_prefixes = LinesConfigOption(
+        item=StringConfigOption(),
+        help="List of url prefixes which will be ignored")
+    devserver.devserver_modules = LinesConfigOption(
+        item=StringConfigOption(),
+        help="List of devserver modules to enable")
+    devserver.devserver_default_addr = StringConfigOption(default="127.0.0.1")
+    devserver.devserver_default_port = StringConfigOption(default="8000")
+    devserver.devserver_truncate_sql = BoolConfigOption(default=True)
+    devserver.devserver_ajax_content_length = IntConfigOption(default=300)
+    devserver.devserver_auto_profile = BoolConfigOption(default=False)

=== modified file 'payload/__init__.py'
--- payload/__init__.py	2011-07-08 16:51:25 +0000
+++ payload/__init__.py	2011-07-12 13:52:37 +0000
@@ -92,9 +92,9 @@
 
 
 def run():
-    """Run development server using whole WSGI stack."""
-    virtualenv('python wsgiserver.py', capture=False)
-
+    """Run SSO using devserver."""
+    virtualenv('python django_project/manage.py runserver ' + ' '.join(args),
+               capture=False)
 
 # deploy
 def makemessages():

=== modified file 'requirements.txt'
--- requirements.txt	2011-07-06 17:36:56 +0000
+++ requirements.txt	2011-07-12 13:52:37 +0000
@@ -15,3 +15,6 @@
 
 # development dependencies
 werkzeug
+django-devserver==0.1.7
+sqlparse==0.1.2
+line_profiler==1.0b2

=== removed file 'wsgiserver.py'
--- wsgiserver.py	2011-03-14 19:17:40 +0000
+++ wsgiserver.py	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-from SocketServer import ThreadingMixIn
-from wsgiref.simple_server import WSGIServer, make_server
-
-import os
-import sys
-sys.path.insert(0, os.path.abspath('django_project'))
-os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
-
-from identityprovider.wsgi import make_app
-
-class ThreadedWSGIServer(ThreadingMixIn, WSGIServer):
-    pass
-
-httpd = make_server('', 8000, make_app(), server_class=ThreadedWSGIServer)
-
-
-print "Serving HTTP on port 8000..."
-
-# Respond to requests until process is killed
-httpd.serve_forever()