Merge lp:~cjohnston/uci-engine/p-d-logging into lp:uci-engine

[Chris Johnston]

Add ability to specify where gunicorn logging happens from the python-django charm.

[Andy Doan (doanac)]

i loathe this "instance_type" stuff, but that's out of our control.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:536
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/802/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/802/rebuild

review: Approve (continuous-integration)

=== modified file 'charms/precise/python-django/config.yaml'
--- charms/precise/python-django/config.yaml	2014-05-30 14:46:01 +0000
+++ charms/precise/python-django/config.yaml	2014-06-06 20:03:25 +0000
@@ -67,6 +67,10 @@
         type: string
         default: "/srv/"
         description: The root directory to checkout to.
+    instance_type:
+        type: string
+        default: "development"
+        description: "Instance type (development, staging, or production)"
     application_path:
         type: string
         default: ""

=== modified file 'charms/precise/python-django/hooks/hooks.py'
--- charms/precise/python-django/hooks/hooks.py	2014-06-05 15:32:53 +0000
+++ charms/precise/python-django/hooks/hooks.py	2014-06-06 20:03:25 +0000
@@ -788,7 +788,14 @@
 
     if not config_data['python_path']:
         relation_set({'python_path': install_root})
-
+    if config_data['wsgi_log_file']:
+        relation_set(
+            {'wsgi_log_file': os.path.join(
+                django_logs_dir, config_data['wsgi_log_file'])})
+    if config_data['wsgi_access_logfile']:
+        relation_set(
+            {'wsgi_access_logfile': os.path.join(
+                django_logs_dir, config_data['wsgi_access_logfile'])})
     open_port(config_data['port'])
 
 
@@ -919,19 +926,21 @@
 django_south = config_data['django_south']
 if django_south:
     CHARM_PACKAGES.append('python-django-south')
-
+instance_type = config_data['instance_type']
 unit_name = os.environ['JUJU_UNIT_NAME'].split('/')[0]
 sanitized_unit_name = sanitize(unit_name)
-vcs_clone_dir = os.path.join(install_root, sanitized_unit_name)
+base_dir = os.path.join(install_root, sanitized_unit_name)
+django_settings_modules = '.'.join([sanitized_unit_name, django_settings])
+django_settings_modules = django_settings  # andy hack
+django_run_dir = os.path.join(base_dir, instance_type + '-run')
+django_logs_dir = os.path.join(base_dir, instance_type + '-logs')
+if config_data['wsgi_log_file'] or config_data['wsgi_access_logfile']:
+    install_dir(django_logs_dir, owner=wsgi_user, group=wsgi_group, mode=0755)
+vcs_clone_dir = os.path.join(base_dir, instance_type)
 if application_path:
     working_dir = os.path.join(vcs_clone_dir, application_path)
 else:
     working_dir = vcs_clone_dir
-
-django_settings_modules = '.'.join([sanitized_unit_name, django_settings])
-django_settings_modules = django_settings  # andy hack
-django_run_dir = os.path.join(working_dir, "run/")
-django_logs_dir = os.path.join(working_dir, "logs/")
 settings_py_path = os.path.join(working_dir, 'settings.py')
 urls_py_path = os.path.join(working_dir, 'urls.py')
 settings_dir_path = os.path.join(working_dir, config_data["settings_dir_name"])

=== modified file 'juju-deployer/ppa-assigner.yaml.tmpl'
--- juju-deployer/ppa-assigner.yaml.tmpl	2014-06-03 18:17:09 +0000
+++ juju-deployer/ppa-assigner.yaml.tmpl	2014-06-06 20:03:25 +0000
@@ -13,12 +13,14 @@
                 django_settings: ppa_assigner.settings
                 django_south: True
                 hostname: ppa-assigner
-                python_path: /srv/ci_airline_ppa_django/ci-utils:/srv/ci_airline_ppa_django/ppa-assigner
+                python_path: /srv/ci_airline_ppa_django/development/ci-utils:/srv/ci_airline_ppa_django/development/ppa-assigner
                 unit-config: include-base64://configs/unit_config.yaml
                 json_status_path: api/v1/status/
                 nagios_check_http_params: -H ppa-assigner -I 127.0.0.1 -e '
                     200 OK' --url='/api/v1/' -p 8080
                 nagios_context: ci-airline-staging
+                wsgi_log_file: gunicorn.log
+                wsgi_access_logfile: access.log
         ci-airline-ppa-postgres:
             branch: lp:charms/precise/postgresql@84
             charm: postgresql
@@ -26,7 +28,7 @@
             branch: lp:charms/gunicorn@30
             charm: gunicorn
             options:
-                python_path: /srv/ci_airline_ppa_django/ci-utils:/srv/ci_airline_ppa_django/ppa-assigner
+                python_path: /srv/ci_airline_ppa_django/development/ci-utils:/srv/ci_airline_ppa_django/development/ppa-assigner
     relations:
         # Relations should be explicit as amulet can't infer them otherwise
         # even if there is a single one

=== modified file 'juju-deployer/ticket-system.yaml.tmpl'
--- juju-deployer/ticket-system.yaml.tmpl	2014-06-04 19:40:33 +0000
+++ juju-deployer/ticket-system.yaml.tmpl	2014-06-06 20:03:25 +0000
@@ -28,12 +28,14 @@
                 django_south: True
                 django_debug: True
                 hostname: ci-airline.staging.canonical.com
-                python_path: /srv/ci_airline_ts_django/ci-utils:/srv/ci_airline_ts_django/ticket_system
+                python_path: /srv/ci_airline_ts_django/development/ci-utils:/srv/ci_airline_ts_django/development/ticket_system
                 # this gets shared with gunicorn via a relation-set in this charm
                 wsgi_wsgi_file: ticket_system.wsgi:application
                 nagios_check_http_params: -H ci-airline.staging.canonical.com -I 127.0.0.1 -e '
                     200 OK' --url='/api/v1/' -p 8080
                 nagios_context: ci-airline-staging
+                wsgi_log_file: gunicorn.log
+                wsgi_access_logfile: access.log
         ci-airline-ts-postgres:
             branch: lp:charms/precise/postgresql@84
             charm: postgresql
@@ -41,7 +43,7 @@
             branch: lp:charms/gunicorn@30
             charm: gunicorn
             options:
-                python_path: /srv/ci_airline_ts_django/ci-utils:/srv/ci_airline_ts_django/ticket_system
+                python_path: /srv/ci_airline_ts_django/development/ci-utils:/srv/ci_airline_ts_django/development/ticket_system
         ci-airline-rabbit:
             branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@46
             charm: rabbitmq