Merge lp:~bloodearnest/charms/trusty/gunicorn/fix-envs into lp:~bloodearnest/charms/trusty/gunicorn/trunk

[Simon Davy]

Move env vars to upstart/runner templates rather than raw_env

Move env vars to upstart/runner templates rather than raw_env

[Maximiliano Bertacchini (maxiberta)]

LGTM! Thanks,

review: Approve

=== modified file 'hooks/tests/test_template.py'
--- hooks/tests/test_template.py	2016-10-10 13:07:21 +0000
+++ hooks/tests/test_template.py	2017-03-22 13:59:43 +0000
@@ -78,11 +78,14 @@
     setgid WSGI_GROUP
     chdir WORKING_DIR
 
+    env A="1"
+    env B="2 3"
     exec GUNICORN_PATH WSGI_CLI --config WSGI_CONFIG_FILE WSGI_WSGI_FILE
     """).strip()
 
     def test_upstart_template(self):
         ctx = self.get_test_context()
+        ctx['env_extra'] = [['A', '1'], ['B', '2 3']]
         hooks.process_template('upstart.tmpl', ctx, 'path')
         output = self.file.write.call_args[0][0]
         self.assertMultiLineEqual(self.UPSTART_EXPECTED, output)
@@ -94,12 +97,16 @@
     #--------------------------------------------------------------
     # This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
     #--------------------------------------------------------------
+    export A="1"
+    export B="2 3"
     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()
+        ctx['env_extra'] = [['A', '1'], ['B', '2 3']]
+        hooks.process_template('upstart.tmpl', ctx, 'path')
         hooks.process_template('runner.tmpl', ctx, 'path')
         output = self.file.write.call_args[0][0]
         self.assertMultiLineEqual(self.RUNNER_EXPECTED, output)
@@ -136,7 +143,6 @@
         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()
@@ -170,13 +176,6 @@
         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"]

=== modified file 'templates/config.tmpl'
--- templates/config.tmpl	2016-10-10 13:07:21 +0000
+++ templates/config.tmpl	2017-03-22 13:59:43 +0000
@@ -31,10 +31,3 @@
 {% for line in wsgi_extra_config_lines %}
 {{ line }}
 {% endfor %}
-{% if env_extra %}
-raw_env = [
-    {% for k,v in env_extra -%}
-    '{{k }}={{ v }}',
-    {% endfor -%}
-]
-{% endif %}

=== modified file 'templates/runner.tmpl'
--- templates/runner.tmpl	2015-09-25 13:59:18 +0000
+++ templates/runner.tmpl	2017-03-22 13:59:43 +0000
@@ -2,5 +2,11 @@
 #--------------------------------------------------------------
 # This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
 #--------------------------------------------------------------
+{% if env_extra -%}
+{% for k, v in env_extra -%}
+export {{ k }}="{{ v }}"
+{% endfor -%}
+{% endif -%}
+
 cd {{ working_dir }}
 {{ gunicorn_path }} {{ wsgi_cli }} --config {{ wsgi_config_file }} $@ {{ wsgi_wsgi_file }}

=== modified file 'templates/upstart.tmpl'
--- templates/upstart.tmpl	2015-09-25 13:59:18 +0000
+++ templates/upstart.tmpl	2017-03-22 13:59:43 +0000
@@ -15,4 +15,10 @@
 setgid {{ wsgi_group }}
 chdir {{ working_dir }}
 
+{% if env_extra -%}
+{% for k, v in env_extra -%}
+env {{ k }}="{{ v }}"
+{% endfor -%}
+{% endif -%}
+
 exec {{ gunicorn_path }} {{ wsgi_cli }} --config {{ wsgi_config_file }} {{ wsgi_wsgi_file }}