Merge lp:~jacekn/charms/precise/haproxy/haproxy-stats-socket into lp:charms/haproxy
Proposed by
Jacek Nykis
Status: | Work in progress |
---|---|
Proposed branch: | lp:~jacekn/charms/precise/haproxy/haproxy-stats-socket |
Merge into: | lp:charms/haproxy |
Diff against target: |
132 lines (+39/-3) 4 files modified
README.md (+1/-1) config.yaml (+18/-0) hooks/hooks.py (+12/-2) hooks/tests/test_helpers.py (+8/-0) |
To merge this branch: | bzr merge lp:~jacekn/charms/precise/haproxy/haproxy-stats-socket |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Ceppi (community) | Needs Fixing | ||
Review via email:
|
Description of the change
* add support for stats socket including specifying access level
* add new "install_hatop" config option
This MP includes changes from here:
https:/
To post a comment you must log in.
Unmerged revisions
- 81. By Jacek Nykis
-
Fixed small bug when using global_
stats_socket_ level - 80. By Jacek Nykis
-
Added install_hatop config option
- 79. By Jacek Nykis
-
Added global_
stats_socket_ level option to allow restricted socket creation - 78. By Jacek Nykis
-
Merged Andrew's haproxy stats socket changes
- 77. By Jacek Nykis
-
Merged Andres changes to fix test linting errors and update README with additional required packages to run the test suite.
The unit tests fail for me:
$ make test
http:// paste.ubuntu. com/7033134/
Lint fails with the following:
Checking for Python syntax... haproxy/ hooks/hooks. py:638: 62: E901 SyntaxError: invalid token haproxy/ hooks/tests/ utils_for_ tests.py: 13:32: F821 undefined name 'file'
/tmp/precise/
/tmp/precise/
make: *** [lint] Error 1
Once these have been addressed and you're ready for another review make sure to "Request another review" from "charmers" to have it placed back in the queue. Thanks!