Merge lp:~jacekn/charms/trusty/prometheus-pushgateway/open-port into lp:~canonical-is-sa/charms/trusty/prometheus-pushgateway/layer-prometheus-pushgateway

[Jacek Nykis]

Ensure pushgateway opens its port

[Tom Haddon (mthaddon)]

Looks good.

review: Approve

[JuanJo Ciarlante (jjo)]

review: Approve (lgtm)

=== modified file 'reactive/pushgateway.py'
--- reactive/pushgateway.py	2016-03-17 18:45:31 +0000
+++ reactive/pushgateway.py	2016-06-15 16:42:30 +0000
@@ -36,12 +36,22 @@
     return sorted(args_list)
 
 
+def check_ports(new_port):
+    kv = unitdata.kv()
+    if kv.get('pushgateway.port') != new_port:
+        hookenv.open_port(new_port)
+        if kv.get('pushgateway.port'):  # Dont try to close non existing ports
+            hookenv.close_port(kv.get('pushgateway.port'))
+        kv.set('pushgateway.port', new_port)
+
+
 @when('pushgateway.do-reconfig-def')
 def write_pushgateway_config_def():
     config = hookenv.config()
-    if config.get('port', False):
-        runtime_args('-web.listen-address',
-                     ':{}'.format(config['port']))
+    port = config.get('port', '9091')
+    check_ports(port)
+    runtime_args('-web.listen-address',
+                 ':{}'.format(port))
     if config.get('persistence_file'):
         runtime_args('-persistence.file', config['persistence_file'])
     args = runtime_args()