Merge lp:~bloodearnest/charms/trusty/gunicorn/config-rework into lp:charms/trusty/gunicorn

[Simon Davy]

Use a config file rather than cli args, and some tweaks to wsgi config.
You can now supply config as python config to be included in the config file, or as cli args, which is backwards compatible with config for previous charm version.

Use a config file rather than cli args.

This is complete rework of the way gunicorn is configured. It's been extensively used in this form for a good while, as we were using a branch.

There are some changes to config options here, but they are all backwards compatible, unit tested, and documented.

Unmerged revisions

36. By Simon Davy on 2016-09-13

merging config rework from lp:~bloodearnest/charms/gunicorn/trunk

=== modified file '.bzrignore'
--- .bzrignore	2014-02-11 14:15:13 +0000
+++ .bzrignore	2016-09-13 16:09:18 +0000
@@ -1,1 +1,3 @@
 bin
+.coverage
+.venv

=== modified file 'Makefile'
--- Makefile	2014-04-28 09:56:32 +0000
+++ Makefile	2016-09-13 16:09:18 +0000
@@ -1,8 +1,14 @@
 #!/usr/bin/make
-PYTHON := /usr/bin/env python
-
-unit_test:
-	nosetests -s --with-coverage --cover-package=hooks hooks
+VENV = .venv
+PYTHON = $(VENV)/bin/python
+
+$(VENV): requirements.txt
+	virtualenv --system-site-packages $@
+	$(VENV)/bin/pip install -r requirements.txt
+
+
+unit_test: .venv
+	$(VENV)/bin/nosetests -s --with-coverage --cover-package=hooks hooks
 
 sync-charm-helpers: bin/charm_helpers_sync.py
 	@mkdir -p bin

=== modified file 'config.yaml'
--- config.yaml	2016-01-28 09:14:23 +0000
+++ config.yaml	2016-09-13 16:09:18 +0000
@@ -59,10 +59,32 @@
         type: string
         default: ""
         description: "The Access log format. Don't forget to escape all quotes and round brackets."
+    wsgi_error_logfile:
+        type: string
+        default: ""
+        description: "The error log file to write to."
+    wsgi_cli:
+        type: string
+        default: ""
+        description: >
+            Extra cli arguments to gunicorn.
+            e.g. '--debug --timeouts 2'.
+            DEPRECATED: use wsgi_extra_config
     wsgi_extra:
         type: string
         default: ""
-        description: "Space separated extra settings. For example: --debug"
+        description: >
+            Backwards compatibility name for wsgi_cli
+            DEPRECATED: use wsgi_extra_config
+    wsgi_extra_config:
+        type: string
+        default: ""
+        description: >
+            Extra config, as newline seperated python statements.
+            e.g.
+
+            debug = True
+            timeouts = 2
     wsgi_timestamp:
         type: string
         default: ""
@@ -89,3 +111,9 @@
         description: >
             List of environment variables for the wsgi process. 
             e.g. FOO="bar" BAZ="1 2 3"
+    gunicorn_path:
+        type: string
+        default: gunicorn
+        description: >
+            Path to gunicorn. Defaults to system.
+            Use if run in venv.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-05-01 13:14:53 +0000
+++ hooks/hooks.py	2016-09-13 16:09:18 +0000
@@ -58,7 +58,7 @@
 
 
 def remove_old_services():
-    """Clean up older charm config if we are upgrading to new python based charm"""
+    "Clean up older charm config if we are upgrading to new python based charm"
 
     if not os.path.exists(GUNICORN_INITD_SCRIPT_DISABLED):
         # ensure the sysv service is disabled
@@ -67,7 +67,7 @@
         # ensure the sysv init is stopped
         subprocess.call([GUNICORN_INITD_SCRIPT, 'stop'])
 
-        # ensure any old charm config removed. 
+        # ensure any old charm config removed.
         for conf in glob.glob('/etc/gunicorn.d/*.conf'):
             try:
                 hookenv.log('removing old guncorn config: %s' % conf)
@@ -75,13 +75,13 @@
             except:  # pragma: no cover
                 pass
 
-        # rename /etc/init.d/gunicorn 
+        # rename /etc/init.d/gunicorn
         if os.path.exists("/etc/init.d/gunicorn"):
             shutil.move(GUNICORN_INITD_SCRIPT, GUNICORN_INITD_SCRIPT_DISABLED)
 
 
 def write_initd_proxy():
-    """Some charms/packages may use hardcoded path of /etc/init.d/gunicorn, so 
+    """Some charms/packages may use hardcoded path of /etc/init.d/gunicorn, so
     add a wrapper there that proxies to the upstart job."""
     with open(GUNICORN_INITD_SCRIPT, 'w') as initd:
         initd.write("#!/bin/sh\nservice gunicorn $*\n")
@@ -97,6 +97,7 @@
 def install():
     ensure_packages()
     write_initd_proxy()
+    host.mkdir('/srv/gunicorn', force=True)
 
 
 @hooks.hook('upgrade-charm')
@@ -104,6 +105,7 @@
     ensure_packages()
     remove_old_services()  # TODO: remove later
     write_initd_proxy()
+    host.mkdir('/srv/gunicorn', force=True)
 
 
 @hooks.hook(
@@ -118,19 +120,22 @@
         hookenv.log("No wsgi-file relation, nothing to do")
         return
 
+    # this is a subordinate, so only ever one relation
     relation_data = relations[0]
-
-    service_name = sanitized_service_name()
-    wsgi_config['unit_name'] = service_name
-
-    project_conf = "/etc/init/gunicorn.conf"
-
     working_dir = relation_data.get('working_dir', None)
     if not working_dir:
         return
 
     wsgi_config['working_dir'] = working_dir
-    wsgi_config['project_name'] = service_name
+    service_name = sanitized_service_name()
+    wsgi_config['service_name'] = service_name
+
+    # hardcoded job for now, we might want to use something else in future
+    upstart_file = "/etc/init/gunicorn.conf"
+    # can't use /etc/gunicorn.d/ as that is for debians method
+    config_file = "/srv/gunicorn/{}.py".format(service_name)
+    runner_file = "/srv/gunicorn/run_{}.sh".format(service_name)
+    wsgi_config['wsgi_config_file'] = config_file
 
     # any valid config item can be overidden by a relation item
     for key, relation_value in relation_data.items():
@@ -145,47 +150,71 @@
         fetch.apt_install('python-tornado')
 
     if str(wsgi_config['wsgi_workers']) == '0':
-        wsgi_config['wsgi_workers'] = cpu_count() + 1
+        wsgi_config['wsgi_workers'] = (cpu_count() * 2) + 1
 
+    # env_extra was originally a partial python dict, to templated into
+    # a python dict for debian's gunicorn config
+    # e.g env_extra = "'FOO': 'BAR', 'A': '1'"
+    #
+    # Now it is just a standard env string, e.g.
+    # e.g. env_extra = "FOO=BAR A=1"
     env_extra = wsgi_config.get('env_extra', '')
-
-    # support old python dict format for env_extra for upgrade path
     extra = []
-    # attempt dict parsing
+
     try:
+        # old style dict parsing
         dict_str = '{' + env_extra + '}'
         extra = [[k, str(v)] for k, v in ast.literal_eval(dict_str).items()]
     except (SyntaxError, ValueError):
         pass
 
     if not extra:
+        # new style string
         extra = [
             v.split('=', 1) for v in shlex.split(env_extra) if '=' in v
         ]
 
     wsgi_config['env_extra'] = extra
 
-
-    # support old python list format for wsgi_extra
-    # it will be a partial tuple of strings
-    # e.g. wsgi_extra = "'foo', 'bar',"
-
-    wsgi_extra = wsgi_config.get('wsgi_extra', '')
+    # wsgi_cli (formely just wsgi_extra) used to be a list of cli args in
+    # a partial python list like format
+    # e.g. wsgi_cli = "'--foo=bar', '-a'"
+    #
+    # Now it is a simple string of of cli params
+    # e.g wsgi_cli = "--foo=bar -a"
+
+    wsgi_cli = wsgi_config.get('wsgi_cli', None)
+    if not wsgi_cli:
+        wsgi_cli = wsgi_config.get('wsgi_extra', '')
+
     # attempt tuple parsing
     try:
-        tuple_str = '(' + wsgi_extra + ')'
-        wsgi_extra = " ".join(ast.literal_eval(tuple_str))
+        tuple_str = '(' + wsgi_cli + ')'
+        wsgi_cli = " ".join(ast.literal_eval(tuple_str))
     except (SyntaxError, ValueError):
         pass
 
-    wsgi_config['wsgi_extra'] = wsgi_extra
-
-    process_template('upstart.tmpl', wsgi_config, project_conf)
-    hookenv.log('written gunicorn upstart config to %s' % project_conf)
+    wsgi_config['wsgi_cli'] = wsgi_cli
+
+    extra_config = wsgi_config.get('wsgi_extra_config', '')
+    extra_config_lines = extra_config.split('\n') if extra_config else []
+    wsgi_config['wsgi_extra_config_lines'] = extra_config_lines
+
+    process_template('config.tmpl', wsgi_config, config_file)
+    hookenv.log(
+        'written gunicorn config for %s to %s' % (service_name, config_file))
+    process_template('upstart.tmpl', wsgi_config, upstart_file)
+    hookenv.log('written gunicorn upstart config to %s' % upstart_file)
+    process_template('runner.tmpl', wsgi_config, runner_file)
+    os.chmod(runner_file, 0755)
 
     # We need this because when the contained charm configuration or code
     # changed Gunicorn needs to restart to run the new code.
     host.service_restart("gunicorn")
+    try:
+        hookenv.open_port(wsgi_config['port'])
+    except subprocess.CalledProcessError:  # pragma: no cover
+        pass  # already open
 
 
 @hooks.hook("wsgi_file_relation_broken")

=== modified file 'hooks/tests/test_hooks.py'
--- hooks/tests/test_hooks.py	2014-05-01 13:14:53 +0000
+++ hooks/tests/test_hooks.py	2016-09-13 16:09:18 +0000
@@ -67,20 +67,32 @@
             'hooks.sanitized_service_name', return_value=self.SERVICE_NAME)
         self.apply_patch('hooks.cpu_count', return_value=1)
 
-    def assert_wsgi_config_applied(self, expected):
-        tmpl, config, path = self.process_template.call_args[0]
-        self.assertEqual(tmpl, 'upstart.tmpl')
-        self.assertEqual(path, '/etc/init/gunicorn.conf')
-        self.assertEqual(config, expected)
+    def assert_config_applied(self, expected):
+
+        cfg_tmpl, cfg_env, cfg_path = self.process_template.mock_calls[0][1]
+        self.assertEqual(cfg_tmpl, 'config.tmpl')
+        self.assertEqual(cfg_env, expected)
+        self.assertEqual(
+            cfg_path, '/srv/gunicorn/{}.py'.format(self.SERVICE_NAME))
+
+        up_tmpl, up_env, up_path = self.process_template.mock_calls[1][1]
+        self.assertEqual(up_tmpl, 'upstart.tmpl')
+        self.assertEqual(up_path, '/etc/init/gunicorn.conf')
+        self.assertEqual(up_env, expected)
+
         self.host.service_restart.assert_called_once_with("gunicorn")
+        self.hookenv.open_port.assert_called_once_with(expected['port'])
 
     def get_default_context(self):
         expected = DEFAULTS.copy()
-        expected['unit_name'] = self.SERVICE_NAME
+        # extra config added by the hook that's not in the charm config
         expected['working_dir'] = self.WORKING_DIR
-        expected['project_name'] = self.SERVICE_NAME
-        expected['wsgi_workers'] = 2
+        expected['service_name'] = self.SERVICE_NAME
+        expected['wsgi_workers'] = 3
         expected['env_extra'] = []
+        expected['wsgi_extra_config_lines'] = []
+        expected['wsgi_config_file'] = '/srv/gunicorn/' + self.SERVICE_NAME + '.py'
+        expected['wsgi_config_file'] = '/srv/gunicorn/' + self.SERVICE_NAME + '.py'
         fmt = expected['wsgi_access_logformat'].replace('"', '\\"')
         expected['wsgi_access_logformat'] = fmt
         return expected
@@ -109,13 +121,13 @@
         mock_exists.side_effect = [False, True]
 
         hooks.remove_old_services()
-    
+
         self.assertEqual(
-            self.subprocess.call.mock_calls[0][1][0], 
+            self.subprocess.call.mock_calls[0][1][0],
             ['update-rc.d', '-f', 'gunicorn', 'disable']
         )
         self.assertEqual(
-            self.subprocess.call.mock_calls[1][1][0], 
+            self.subprocess.call.mock_calls[1][1][0],
             ['/etc/init.d/gunicorn', 'stop']
         )
         mock_remove.assert_called_once_with(path)
@@ -125,12 +137,12 @@
     def test_default_configure_gunicorn(self):
         hooks.configure_gunicorn()
         expected = self.get_default_context()
-        self.assert_wsgi_config_applied(expected)
+        self.assert_config_applied(expected)
 
     def test_configure_gunicorn_no_relations(self):
         self.hookenv.relations_of_type.return_value = []
         hooks.configure_gunicorn()
-        self.hookenv.log.assert_called_once_With("No wsgi-file relation, nothing to do")
+        self.hookenv.log.assert_called_once_with("No wsgi-file relation, nothing to do")
         self.assertFalse(self.process_template.called)
         self.assertFalse(self.host.service_restart.called)
 
@@ -153,7 +165,7 @@
         expected['wsgi_workers'] = 1
         expected['port'] = 9999
 
-        self.assert_wsgi_config_applied(expected)
+        self.assert_config_applied(expected)
 
     def test_env_extra_parsing(self):
         self.relation_data['env_extra'] = 'A=1 B="2" C="3 4" D= E'
@@ -169,7 +181,7 @@
             # no E
         ]
 
-        self.assert_wsgi_config_applied(expected)
+        self.assert_config_applied(expected)
 
     def test_env_extra_old_style_parsing(self):
         self.relation_data['env_extra'] = "'A': '1', 'B': 2"
@@ -182,31 +194,31 @@
             ['B', '2'],
         ]
 
-        self.assert_wsgi_config_applied(expected)
+        self.assert_config_applied(expected)
 
     def test_wsgi_extra_old_style_parsing_single_param(self):
-        self.relation_data['wsgi_extra'] = "'--some-option',"
+        self.relation_data['wsgi_cli'] = "'--some-option',"
         hooks.configure_gunicorn()
         expected = self.get_default_context()
-        expected['wsgi_extra'] = "--some-option"
+        expected['wsgi_cli'] = "--some-option"
 
-        self.assert_wsgi_config_applied(expected)
+        self.assert_config_applied(expected)
 
     def test_wsgi_extra_old_style_parsing_mulit_param(self):
-        self.relation_data['wsgi_extra'] = "'--some-option', '--other-option',"
+        self.relation_data['wsgi_cli'] = "'--some-option', '--other-option',"
         hooks.configure_gunicorn()
         expected = self.get_default_context()
-        expected['wsgi_extra'] = "--some-option --other-option"
+        expected['wsgi_cli'] = "--some-option --other-option"
 
-        self.assert_wsgi_config_applied(expected)
+        self.assert_config_applied(expected)
 
     def test_wsgi_extra_old_style_parsing_bad_value(self):
-        self.relation_data['wsgi_extra'] = "BAD PYTHON"
+        self.relation_data['wsgi_cli'] = "BAD PYTHON"
         hooks.configure_gunicorn()
         expected = self.get_default_context()
-        expected['wsgi_extra'] = "BAD PYTHON"
+        expected['wsgi_cli'] = "BAD PYTHON"
 
-        self.assert_wsgi_config_applied(expected)
+        self.assert_config_applied(expected)
 
     def do_worker_class(self, worker_class):
         self.relation_data['wsgi_worker_class'] = worker_class
@@ -215,7 +227,7 @@
             'python-%s' % worker_class)
         expected = self.get_default_context()
         expected['wsgi_worker_class'] = worker_class
-        self.assert_wsgi_config_applied(expected)
+        self.assert_config_applied(expected)
 
     def test_configure_worker_class_eventlet(self):
         self.do_worker_class('eventlet')
@@ -231,3 +243,4 @@
         hooks.wsgi_file_relation_broken()
         self.host.service_stop.assert_called_once_with("gunicorn")
         remove.assert_called_once_with('/etc/init/gunicorn.conf')
+

=== modified file 'hooks/tests/test_template.py'
--- hooks/tests/test_template.py	2016-01-28 09:14:23 +0000
+++ hooks/tests/test_template.py	2016-09-13 16:09:18 +0000
@@ -1,60 +1,17 @@
 import os
+import textwrap
+from types import ModuleType
+
 from unittest import TestCase
 from mock import patch, MagicMock
 
 import hooks
 
-EXPECTED = """
-#--------------------------------------------------------------
-# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
-#--------------------------------------------------------------
-
-description "Gunicorn daemon for the PROJECT_NAME project"
-
-start on (local-filesystems and net-device-up IFACE=eth0)
-stop on runlevel [!12345]
-
-# If the process quits unexpectadly trigger a respawn
-respawn
-respawn limit 10 5
-
-setuid WSGI_USER
-setgid WSGI_GROUP
-chdir WORKING_DIR
-
-# This line can be removed and replace with the --pythonpath PYTHON_PATH \\
-# option with Gunicorn>1.17
-env PYTHONPATH=PYTHON_PATH
-env A="1"
-env B="1 2"
-
-
-exec gunicorn \\
-    --name=PROJECT_NAME \\
-    --workers=WSGI_WORKERS \\
-    --worker-class=WSGI_WORKER_CLASS \\
-    --worker-connections=WSGI_WORKER_CONNECTIONS \\
-    --max-requests=WSGI_MAX_REQUESTS \\
-    --backlog=WSGI_BACKLOG \\
-    --timeout=WSGI_TIMEOUT \\
-    --keep-alive=WSGI_KEEP_ALIVE \\
-    --umask=WSGI_UMASK \\
-    --bind=LISTEN_IP:PORT \\
-    --log-file=WSGI_LOG_FILE \\
-    --log-level=WSGI_LOG_LEVEL \\
-    --pid=PID_FILE \\
-    --access-logfile=WSGI_ACCESS_LOGFILE \\
-    --access-logformat=WSGI_ACCESS_LOGFORMAT \\
-    WSGI_EXTRA \\
-    WSGI_WSGI_FILE
-""".strip()
-
-
-class TemplateTestCase(TestCase):
+class BaseTemplateTestCase(TestCase):
     maxDiff = None
 
     def setUp(self):
-        super(TemplateTestCase, self).setUp()
+        super(BaseTemplateTestCase, self).setUp()
         patch_open = patch('hooks.open', create=True)
         self.open = patch_open.start()
         self.addCleanup(patch_open.stop)
@@ -71,57 +28,158 @@
         self.addCleanup(patch_hookenv.stop)
 
     def get_test_context(self):
-        keys = [
-            'project_name',
+        string_keys = [
+            'service_name',
             'wsgi_user',
             'wsgi_group',
             'working_dir',
-            'python_path',
+            'wsgi_worker_class',
+            'wsgi_log_file',
+            'wsgi_log_level',
+            'pid_file',
+            'listen_ip',
+            'port',
+            'wsgi_cli',
+            'wsgi_wsgi_file',
+            'wsgi_config_file',
+            'gunicorn_path',
+        ]
+        int_keys = [
             'wsgi_workers',
-            'wsgi_worker_class',
             'wsgi_worker_connections',
             'wsgi_max_requests',
             'wsgi_backlog',
             'wsgi_timeout',
             'wsgi_keep_alive',
             'wsgi_umask',
-            'wsgi_log_file',
-            'wsgi_log_level',
-            'pid_file',
-            'wsgi_access_logfile',
-            'wsgi_access_logformat',
-            'listen_ip',
-            'port',
-            'wsgi_extra',
-            'wsgi_wsgi_file',
         ]
-        ctx = dict((k, k.upper()) for k in keys)
-        ctx['env_extra'] = [["A", "1"], ["B", "1 2"]]
+        ctx = dict((k, k.upper()) for k in string_keys)
+        ctx.update(dict((k, 1) for k in int_keys))
         return ctx
 
-    def test_template(self):
-
-        ctx = self.get_test_context()
-
-        hooks.process_template('upstart.tmpl', ctx, 'path')
-        output = self.file.write.call_args[0][0]
-
-        self.assertMultiLineEqual(EXPECTED, output)
-
-    def test_no_access_logfile(self):
-        ctx = self.get_test_context()
-        ctx['wsgi_access_logfile'] = ""
-
-        hooks.process_template('upstart.tmpl', ctx, 'path')
-        output = self.file.write.call_args[0][0]
-
-        self.assertNotIn('--access-logfile', output)
-
-    def test_no_access_logformat(self):
-        ctx = self.get_test_context()
-        ctx['wsgi_access_logformat'] = ""
-
-        hooks.process_template('upstart.tmpl', ctx, 'path')
-        output = self.file.write.call_args[0][0]
-
-        self.assertNotIn('--access-logformat', output)
+
+class UpstartTemplateTestCase(BaseTemplateTestCase):
+    UPSTART_EXPECTED = textwrap.dedent("""
+    #--------------------------------------------------------------
+    # This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+    #--------------------------------------------------------------
+
+    description "Gunicorn daemon for SERVICE_NAME"
+
+    start on (local-filesystems and net-device-up IFACE=eth0)
+    stop on runlevel [!12345]
+
+    # If the process quits unexpectadly trigger a respawn
+    respawn
+    respawn limit 10 5
+
+    setuid WSGI_USER
+    setgid WSGI_GROUP
+    chdir WORKING_DIR
+
+    exec GUNICORN_PATH WSGI_CLI --config WSGI_CONFIG_FILE WSGI_WSGI_FILE
+    """).strip()
+
+    def test_upstart_template(self):
+        ctx = self.get_test_context()
+        hooks.process_template('upstart.tmpl', ctx, 'path')
+        output = self.file.write.call_args[0][0]
+        self.assertMultiLineEqual(self.UPSTART_EXPECTED, output)
+
+
+class RunnerTemplateTestCase(BaseTemplateTestCase):
+    RUNNER_EXPECTED = textwrap.dedent("""
+    #!/bin/bash
+    #--------------------------------------------------------------
+    # This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+    #--------------------------------------------------------------
+    cd WORKING_DIR
+    GUNICORN_PATH WSGI_CLI --config WSGI_CONFIG_FILE $@ WSGI_WSGI_FILE
+    """).strip()
+
+    def test_runner_template(self):
+        ctx = self.get_test_context()
+        hooks.process_template('runner.tmpl', ctx, 'path')
+        output = self.file.write.call_args[0][0]
+        self.assertMultiLineEqual(self.RUNNER_EXPECTED, output)
+
+
+class ConfigTemplateTestCase(BaseTemplateTestCase):
+
+    def get_module(self, ctx):
+        hooks.process_template('config.tmpl', ctx, 'path')
+        config = self.file.write.call_args[0][0]
+        mod = ModuleType('config')
+        exec(config, mod.__dict__)
+        return mod
+
+    def assert_basic(self, cfg):
+        self.assertEqual(cfg.name, "SERVICE_NAME")
+        self.assertEqual(cfg.workers, 1)
+        self.assertEqual(cfg.worker_class, "WSGI_WORKER_CLASS")
+        self.assertEqual(cfg.worker_connections, 1)
+        self.assertEqual(cfg.max_requests, 1)
+        self.assertEqual(cfg.backlog, 1)
+        self.assertEqual(cfg.timeout, 1)
+        self.assertEqual(cfg.keep_alive, 1)
+        self.assertEqual(cfg.umask, 1)
+        self.assertEqual(cfg.bind, ['LISTEN_IP:PORT'])
+        self.assertEqual(cfg.log_file, "WSGI_LOG_FILE")
+        self.assertEqual(cfg.log_level, "WSGI_LOG_LEVEL")
+        self.assertEqual(cfg.pidfile, "PID_FILE")
+
+    def test_config_template(self):
+        ctx = self.get_test_context()
+        mod = self.get_module(ctx)
+        self.assert_basic(mod)
+        # optional config should not be there
+        self.assertFalse(hasattr(mod, 'accesslog'))
+        self.assertFalse(hasattr(mod, 'access_log_format'))
+        self.assertFalse(hasattr(mod, 'pythonpath'))
+        self.assertFalse(hasattr(mod, 'raw_env'))
+
+    def test_access_logfile(self):
+        ctx = self.get_test_context()
+        ctx['wsgi_access_logfile'] = "WSGI_ACCESS_LOGFILE"
+        mod = self.get_module(ctx)
+        self.assert_basic(mod)
+        self.assertEqual(mod.accesslog, 'WSGI_ACCESS_LOGFILE')
+        self.assertFalse(hasattr(mod, 'access_log_format'))
+
+    def test_access_logformat(self):
+        ctx = self.get_test_context()
+        ctx['wsgi_access_logformat'] = "WSGI_ACCESS_LOGFORMAT"
+        mod = self.get_module(ctx)
+        self.assert_basic(mod)
+        self.assertEqual(mod.access_log_format, 'WSGI_ACCESS_LOGFORMAT')
+        self.assertFalse(hasattr(mod, 'accesslog'))
+
+    def test_errorlog(self):
+        ctx = self.get_test_context()
+        ctx['wsgi_error_logfile'] = "WSGI_ERROR_LOGFILE"
+        mod = self.get_module(ctx)
+        self.assert_basic(mod)
+        self.assertEqual(mod.errorlog, 'WSGI_ERROR_LOGFILE')
+        self.assertFalse(hasattr(mod, 'access_log_format'))
+
+    def test_pythonpath(self):
+        ctx = self.get_test_context()
+        ctx['python_path'] = "PYTHONPATH"
+        mod = self.get_module(ctx)
+        self.assert_basic(mod)
+        self.assertEqual(mod.pythonpath, 'PYTHONPATH')
+
+    def test_env_extra(self):
+        ctx = self.get_test_context()
+        ctx['env_extra'] = [['A', '1'], ['B', '2 3']]
+        mod = self.get_module(ctx)
+        self.assert_basic(mod)
+        self.assertEqual(mod.raw_env, ['A=1', 'B=2 3'])
+
+    def test_config_extra(self):
+        ctx = self.get_test_context()
+        ctx['wsgi_extra_config_lines'] = ["x=1", "y='2'"]
+        mod = self.get_module(ctx)
+        self.assert_basic(mod)
+        self.assertEqual(mod.x, 1)
+        self.assertEqual(mod.y, '2')

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-02-27 10:20:51 +0000
+++ metadata.yaml	2016-09-13 16:09:18 +0000
@@ -1,7 +1,7 @@
 name: gunicorn
-summary: Gunicorn
-maintainer: Patrick Hetu <[e-mail]>
-categories: ["misc"]
+summary: Gunicorn http python wsgi server
+maintainers: ['Patrick Hetu <[e-mail]>', 'Simon Davy <[e-mail]>']
+tags: ['python', 'django', 'wsgi', 'web']
 description: |
   Gunicorn or Green Unicorn is a Python WSGI HTTP Server for UNIX. It's a
   pre-fork worker model ported from Ruby's Unicorn project. The Gunicorn server

=== added file 'requirements.txt'
--- requirements.txt	1970-01-01 00:00:00 +0000
+++ requirements.txt	2016-09-13 16:09:18 +0000
@@ -0,0 +1,4 @@
+mock
+nose
+pyyaml
+coverage

=== modified file 'revision'
--- revision	2014-04-22 10:02:51 +0000
+++ revision	2016-09-13 16:09:18 +0000
@@ -1,1 +1,1 @@
-4
+5

=== added file 'templates/config.tmpl'
--- templates/config.tmpl	1970-01-01 00:00:00 +0000
+++ templates/config.tmpl	2016-09-13 16:09:18 +0000
@@ -0,0 +1,41 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+# 
+# config for gunicorn service {{ service_name }}
+
+name = "{{ service_name }}"
+workers = {{ wsgi_workers }}
+worker_class = "{{ wsgi_worker_class }}"
+worker_connections = {{ wsgi_worker_connections }}
+max_requests = {{ wsgi_max_requests }}
+backlog = {{ wsgi_backlog }}
+timeout = {{ wsgi_timeout }}
+keep_alive = {{ wsgi_keep_alive }}
+umask = {{ wsgi_umask }}
+bind = ['{{ listen_ip }}:{{ port }}']
+log_file = "{{ wsgi_log_file }}"
+log_level = "{{ wsgi_log_level }}"
+pidfile = "{{ pid_file }}"
+{% if wsgi_access_logfile %}
+accesslog = "{{ wsgi_access_logfile }}"
+{% endif %}
+{% if wsgi_access_logformat %}
+access_log_format = "{{ wsgi_access_logformat }}"
+{% endif %}
+{% if wsgi_error_logfile %}
+errorlog = "{{ wsgi_error_logfile }}"
+{% endif %}
+{% if python_path %}
+pythonpath = "{{ python_path }}"
+{% endif %}
+{% for line in wsgi_extra_config_lines %}
+{{ line }}
+{% endfor %}
+{% if env_extra %}
+raw_env = [
+    {% for k,v in env_extra -%}
+    '{{k }}={{ v }}',
+    {% endfor -%}
+]
+{% endif %}

=== added file 'templates/runner.tmpl'
--- templates/runner.tmpl	1970-01-01 00:00:00 +0000
+++ templates/runner.tmpl	2016-09-13 16:09:18 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+cd {{ working_dir }}
+{{ gunicorn_path }} {{ wsgi_cli }} --config {{ wsgi_config_file }} $@ {{ wsgi_wsgi_file }}

=== modified file 'templates/upstart.tmpl'
--- templates/upstart.tmpl	2016-01-28 09:14:23 +0000
+++ templates/upstart.tmpl	2016-09-13 16:09:18 +0000
@@ -2,7 +2,7 @@
 # This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
 #--------------------------------------------------------------
 
-description "Gunicorn daemon for the {{ project_name }} project"
+description "Gunicorn daemon for {{ service_name }}"
 
 start on (local-filesystems and net-device-up IFACE=eth0)
 stop on runlevel [!12345]
@@ -15,32 +15,4 @@
 setgid {{ wsgi_group }}
 chdir {{ working_dir }}
 
-# This line can be removed and replace with the --pythonpath {{ python_path }} \
-# option with Gunicorn>1.17
-env PYTHONPATH={{ python_path }}
-{% for name, value in env_extra -%}
-env {{ name }}="{{ value }}"
-{% endfor %}
-
-exec gunicorn \
-    --name={{ project_name }} \
-    --workers={{ wsgi_workers }} \
-    --worker-class={{ wsgi_worker_class }} \
-    --worker-connections={{ wsgi_worker_connections }} \
-    --max-requests={{ wsgi_max_requests }} \
-    --backlog={{ wsgi_backlog }} \
-    --timeout={{ wsgi_timeout }} \
-    --keep-alive={{ wsgi_keep_alive }} \
-    --umask={{ wsgi_umask }} \
-    --bind={{ listen_ip }}:{{ port }} \
-    --log-file={{ wsgi_log_file }} \
-    --log-level={{ wsgi_log_level }} \
-    --pid={{ pid_file }} \	
-    {%- if wsgi_access_logfile %}
-    --access-logfile={{ wsgi_access_logfile }} \
-    {%- endif %}
-    {%- if wsgi_access_logformat %}
-    --access-logformat={{ wsgi_access_logformat }} \
-    {%- endif %}
-    {{ wsgi_extra }} \
-    {{ wsgi_wsgi_file }}
+exec {{ gunicorn_path }} {{ wsgi_cli }} --config {{ wsgi_config_file }} {{ wsgi_wsgi_file }}