Merge lp:~abentley/charms/precise/juju-reports/use-configured-port into lp:~juju-qa/charms/precise/juju-reports/trunk

[Aaron Bentley]

Use the configured port for setting website relation data.

This branch changes the way the website relation is handled, so that the port uses the configured value. Since changes to the config (source or revno) can change the configured port, this is done in the same code as config-changed uses.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-05-14 20:08:17 +0000
+++ hooks/common.py	2014-05-15 16:51:20 +0000
@@ -45,8 +45,12 @@
     return config
 
 
+def get_configured_port(ini):
+    return ini_get(ini, 'server:main', 'port')
+
+
 def set_port(ini, open_port=True):
-    port = ini_get(ini, 'server:main', 'port')
+    port = get_configured_port(ini)
     if port is None:
         return
     if open_port:
@@ -177,6 +181,15 @@
     return 'mongodb://%s/?replicaSet=%s' % (','.join(host_ports), replset)
 
 
+def update_website(ini):
+    relation_settings = {
+        'port': get_configured_port(ini),
+        'hostname': hookenv.unit_private_ip(),
+    }
+    for relation_id in hookenv.relation_ids('website'):
+        hookenv.relation_set(relation_id, relation_settings)
+
+
 def update_from_config():
     ini = get_ini()
     try:
@@ -202,3 +215,4 @@
     install_cronjob(config['cron-interval'], config['error-email'])
     start()
     set_port(ini, True)
+    update_website(ini)

=== modified file 'hooks/website-relation-changed'
--- hooks/website-relation-changed	2013-12-19 15:58:12 +0000
+++ hooks/website-relation-changed	2014-05-15 16:51:20 +0000
@@ -1,2 +1,5 @@
-#!/bin/bash
-set -eux relation-set port=6543 hostname=`unit-get private-address`
+#!/usr/bin/env python
+from common import update_from_config
+
+if __name__ == '__main__':
+    update_from_config()