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

[lp:~aglenyoung/charms/precise/haproxy/haproxy-stats-socket]

75. By Andrew Glen-Young on 2014-01-16

Fix test linting errors and update README with additional required packages to run the test suite.

76. By Andrew Glen-Young on 2014-01-16

Allow haproxy stats socket to be configured.

Unmerged revisions

=== modified file 'README.md'
--- README.md	2014-01-07 19:03:41 +0000
+++ README.md	2014-01-16 18:59:58 +0000
@@ -97,7 +97,7 @@
     sudo apt-get install python-software-properties
     sudo add-apt-repository ppa:cjohnston/flake8
     sudo apt-get update
-    sudo apt-get install python-mock python-flake8 python-nose python-nosexcover
+    sudo apt-get install python-mock python-flake8 python-nose python-nosexcover python-testtools charm-tools
 
 To run the tests:
 

=== modified file 'config.yaml'
--- config.yaml	2014-01-07 18:44:15 +0000
+++ config.yaml	2014-01-16 18:59:58 +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-03 16:01:28 +0000
+++ hooks/hooks.py	2014-01-16 18:59:58 +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)
 
 
@@ -616,7 +619,8 @@
                                 "service_%s" % service_name)
             if not os.path.exists(path):
                 os.makedirs(path)
-            full_path = os.path.join(path, "%s.http" % errorfile["http_status"])
+            full_path = os.path.join(
+                path, "%s.http" % errorfile["http_status"])
             with open(full_path, 'w') as f:
                 f.write(base64.b64decode(errorfile["content"]))
 

=== 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 18:59:58 +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()
 

=== modified file 'hooks/tests/test_peer_hooks.py'
--- hooks/tests/test_peer_hooks.py	2013-12-17 16:00:29 +0000
+++ hooks/tests/test_peer_hooks.py	2014-01-16 18:59:58 +0000
@@ -195,7 +195,8 @@
                 hooks.write_service_config(services_dict)
 
                 create_listen_stanza.assert_called_with(
-                    'bar', 'some-host', 'some-port', 'some-options', (1, 2), [])
+                    'bar', 'some-host', 'some-port', 'some-options',
+                    (1, 2), [])
                 mock_open.assert_called_with(
                     '/var/run/haproxy/bar.service', 'w')
                 mock_file.write.assert_called_with('some content')
@@ -231,4 +232,3 @@
                     '/var/lib/haproxy/service_bar/403.http', 'w')
                 mock_file.write.assert_any_call(content)
         self.assertTrue(create_listen_stanza.called)
-