Merge lp:~blr/charms/precise/squid-forwardproxy/port-fix into lp:~canonical-launchpad-branches/charms/precise/squid-forwardproxy/trunk

[Kit Randel]

Ensure port is opened and make update_service_port behaviour clearer.

The charm attempts to avoid closing and reopening preserved ports on config_changed, however as there is no explicit open_port() call on the install hook, the default port is never opened.

[William Grant (wgrant)]

review: Approve (code)

[lp:~blr/charms/precise/squid-forwardproxy/port-fix]

42. By Kit Randel on 2015-09-17

Use sentence case for log messages.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-09-17 22:30:32 +0000
+++ hooks/hooks.py	2015-09-17 22:30:33 +0000
@@ -167,6 +167,7 @@
 def open_port(port=None, protocol="TCP"):
     if port is None:
         return(None)
+    utils.juju_log('INFO', 'Opening port: %d' % int(port))
     return(subprocess.call(['open-port', "%d/%s" %
                             (int(port), protocol)]))
 
@@ -178,6 +179,7 @@
 def close_port(port=None, protocol="TCP"):
     if port is None:
         return(None)
+    utils.juju_log('INFO', 'Closing port: %d' % int(port))
     return(subprocess.call(['close-port', "%d/%s" %
                             (int(port), protocol)]))
 
@@ -188,13 +190,14 @@
 #                        opened and which to close
 #------------------------------------------------------------------------------
 def update_service_ports(old_service_ports=None, new_service_ports=None):
+    preserved_ports = set(old_service_ports).intersection(new_service_ports)
     if old_service_ports is None or new_service_ports is None:
         return(None)
     for port in old_service_ports:
-        if port not in new_service_ports:
+        if port not in preserved_ports:
             close_port(port)
     for port in new_service_ports:
-        if port not in old_service_ports:
+        if port not in preserved_ports:
             open_port(port)
 
 
@@ -380,6 +383,7 @@
 # Hook functions
 ###############################################################################
 def install_hook():
+    config_data = config_get()
     for f in glob.glob('exec.d/*/charm-pre-install'):
         if os.path.isfile(f) and os.access(f, os.X_OK):
             subprocess.check_call(['sh', '-c', f])
@@ -388,6 +392,7 @@
     if not os.path.exists(default_squid3_config_cache_dir):
         os.mkdir(default_squid3_config_cache_dir, 0600)
     shutil.copy2('%s/files/default.squid3' % (os.environ['CHARM_DIR']), '/etc/default/squid3')
+    open_port(config_data['port'])
     return (utils.install_unattended('squid3', 'python-jinja2'))