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

[Kit Randel]

* Add 'run' config option, allowing explicit starting or stopping of the squid service.
* Rename deprecated (invalid?) juju-log log-level 'FATAL' to 'CRITICAL'.

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

38. By Kit Randel on 2015-09-16

Add logging message for service start/stop/reload/restart requests.

39. By Kit Randel on 2015-09-16

Rename deprecated (invalid?) juju-log log-level 'FATAL' to 'CRITICAL'.

40. By Kit Randel on 2015-09-17

Ensure service can start in config_changed hook if not in running state.

41. By Kit Randel on 2015-09-17

Ensure port is opened and make update_service_port behaviour clearer.

[William Grant (wgrant)]

review: Approve (code)

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

42. By Kit Randel on 2015-09-17

Use sentence case for log messages.

=== modified file 'config.yaml'
--- config.yaml	2015-08-14 00:45:46 +0000
+++ config.yaml	2015-09-17 02:56:18 +0000
@@ -47,6 +47,13 @@
     type: int
     default: 8192
     description: Maximum size of an object to be cached (KB).
+  run:
+    type: boolean
+    default: true
+    description: >
+      Run state of squid service. A value of false will stop the service currently running, or prevent
+      the service starting on installation. This is potentially useful for awaiting deployment
+      of a sub-ordinate helper service.
   snmp_community:
     type: string
     default: ''
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-09-01 02:07:43 +0000
+++ hooks/hooks.py	2015-09-17 02:56:18 +0000
@@ -326,6 +326,7 @@
         else:
             return(False)
     elif action in ('start', 'stop', 'reload', 'restart'):
+        utils.juju_log('INFO', 'Requesting %s of squid3 service.' % action)
         retVal = subprocess.call([action, 'squid3'])
         if retVal == 0:
             return(True)
@@ -339,7 +340,7 @@
         nagios_uid = pwd.getpwnam('nagios').pw_uid
         nagios_gid = grp.getgrnam('nagios').gr_gid
     except:
-        utils.juju_log('FATAL', "Nagios user not setup, exiting")
+        utils.juju_log('CRITICAL', 'Nagios user not setup, exiting')
         return
     utils.install_unattended('libwww-perl')
     shutil.copy2('%s/files/nrpe-external-master/check_squid' % (os.environ['CHARM_DIR']), '/usr/local/lib/nagios/plugins/')
@@ -353,7 +354,7 @@
         os.mkdir(nagios_logdir)
         os.chown(nagios_logdir, nagios_uid, nagios_gid)
     if not os.path.exists(nagios_exportdir):
-        utils.juju_log('FATAL', 'Exiting as %s is not accessible' % (nagios_exportdir))
+        utils.juju_log('CRITICAL', 'Exiting as %s is not accessible' % (nagios_exportdir))
         return
     for f in os.listdir(nagios_exportdir):
         if re.search('.*check_squidfp.cfg', f):
@@ -391,19 +392,29 @@
 
 
 def config_changed():
+    config_data = config_get()
+    if not config_data['run']:
+        return(service_squid3('stop'))
+
     current_service_ports = get_service_ports()
     construct_squid3_config()
     update_nrpe_checks()
 
-    if service_squid3("check"):
+    if service_squid3('check'):
         updated_service_ports = get_service_ports()
         update_service_ports(current_service_ports, updated_service_ports)
-        service_squid3("reload")
+        if service_squid3('status'):
+            service_squid3('reload')
+        else:
+            service_squid3('start')
     else:
         sys.exit(1)
 
 
 def start_hook():
+    config_data = config_get()
+    if not config_data['run']:
+        return
     if service_squid3("status"):
         return(service_squid3("restart"))
     else: