Merge lp:~thedac/charms/precise/daisy-retracer/statsd-config into lp:~daisy-pluckers/charms/precise/daisy-retracer/trunk

[David Ames]

Add statsd configuration

[lp:~thedac/charms/precise/daisy-retracer/statsd-config]

51. By David Ames on 2014-03-19

Fix removed comment

=== modified file 'config.yaml'
--- config.yaml	2013-07-05 14:21:58 +0000
+++ config.yaml	2014-03-19 18:18:04 +0000
@@ -134,3 +134,9 @@
       default: ''
       description: |
         The Cassandra RPC password. Leave blank if one is not needed.
+  statsd_host:
+      type: string
+      description: Statsd collection host
+  statsd_port:
+      type: string
+      description: statsd collection port

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2013-07-05 14:21:58 +0000
+++ hooks/config-changed	2014-03-19 18:18:04 +0000
@@ -34,6 +34,13 @@
 [ -n "$ec2_host" ] && save_setting ec2_host "$ec2_host"
 [ -n "$ec2_bucket" ] && save_setting ec2_bucket "$ec2_bucket"
 
+# statsd settings
+statsd_host="$(config-get statsd_host)"
+statsd_port="$(config-get statsd_port)"
+
+[ -n "$statsd_host" ] && save_setting statsd_host "$statsd_host"
+[ -n "$statsd_port" ] && save_setting statsd_port "$statsd_port"
+
 # If the user has set daisy-cassandra-host to null, set cassandra_hosts back to
 # an empty list.
 [ -n "$cassandra_host" ] && save_cassandra "$cassandra_host" #|| \