Merge lp:~aglenyoung/charms/precise/haproxy/haproxy-stats-socket into lp:charms/haproxy

[Andrew Glen-Young]

[Marco Ceppi (marcoceppi)]

Hi Andrew, thanks for taking the time to add this option! Unfortunately your changes do not pass the haproxy unit test.

You can verify this by running `make build` in the charm's root. Please update the tests to reflect your changes.

Barring the tests passing, this LGTM. However, because of the test fails I have to decline this merge. Once you've addressed this issue please select "Request another review" and enter "charmers". This will place your update back in our charm review queue so we can re-review it again.

review: Needs Fixing

[Andrew Glen-Young (aglenyoung)]

I've added a prerequisite branch which cleans up the tests a little before submitting my branch.

The functionality stays the same but I've done the following:
- Updated the config variable name to be consistent with the current convention.
- Added the required tests.

[Tim Van Steenburgh (tvansteenburgh)]

+1 LGTM.

This still fails charm-proof and `make test`, but I've pushed a MP that fixes that: https://code.launchpad.net/~tvansteenburgh/charms/precise/haproxy/fix-proof-and-tests/+merge/233784

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-01-07 18:44:15 +0000
+++ config.yaml	2014-01-16 19:00:01 +0000
@@ -34,6 +34,11 @@
         the same physical server. With the help of this parameter, it becomes 
         possible to add some randomness in the check interval between 0 and 
         +/- 50%. A value between 2 and 5 seems to show good results.
+  global_stats_socket:
+    default: False
+    type: boolean
+    description: |
+        Whether to enable the stats UNIX socket.
   default_log:
     default: "global"
     type: string

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-01-16 19:00:01 +0000
+++ hooks/hooks.py	2014-01-16 19:00:01 +0000
@@ -125,6 +125,9 @@
         haproxy_globals.append("    quiet")
     haproxy_globals.append("    spread-checks %d" %
                            config_data['global_spread_checks'])
+    if config_data['global_stats_socket'] is True:
+        sock_path = "/var/run/haproxy/haproxy.sock"
+        haproxy_globals.append("    stats socket %s mode 0600" % sock_path)
     return '\n'.join(haproxy_globals)
 
 

=== modified file 'hooks/tests/test_helpers.py'
--- hooks/tests/test_helpers.py	2013-12-17 16:00:29 +0000
+++ hooks/tests/test_helpers.py	2014-01-16 19:00:01 +0000
@@ -23,9 +23,11 @@
             'global_spread_checks': 234,
             'global_debug': False,
             'global_quiet': False,
+            'global_stats_socket': True,
         }
         result = hooks.create_haproxy_globals()
 
+        sock_path = "/var/run/haproxy/haproxy.sock"
         expected = '\n'.join([
             'global',
             '    log foo-log',
@@ -34,6 +36,7 @@
             '    user foo-user',
             '    group foo-group',
             '    spread-checks 234',
+            '    stats socket %s mode 0600' % sock_path,
         ])
         self.assertEqual(result, expected)
 
@@ -47,6 +50,7 @@
             'global_spread_checks': 234,
             'global_debug': True,
             'global_quiet': True,
+            'global_stats_socket': False,
         }
         result = hooks.create_haproxy_globals()