Merge lp://staging/~lukasz-czyzykowski/rnr-server/switch_txstatsd_client into lp://staging/rnr-server
Status: | Merged |
---|---|
Approved by: | Łukasz Czyżykowski |
Approved revision: | 228 |
Merged at revision: | 227 |
Proposed branch: | lp://staging/~lukasz-czyzykowski/rnr-server/switch_txstatsd_client |
Merge into: | lp://staging/rnr-server |
Diff against target: |
137 lines (+34/-16) 7 files modified
.bzrignore (+1/-0) django_project/config_dev/config/main.cfg (+4/-0) fabtasks/bootstrap.py (+7/-0) requirements.txt (+0/-1) src/reviewsapp/middleware/stats.py (+3/-0) src/reviewsapp/middleware/txstatsd_client.py (+15/-11) src/reviewsapp/tests/test_middleware.py (+4/-4) |
To merge this branch: | bzr merge lp://staging/~lukasz-czyzykowski/rnr-server/switch_txstatsd_client |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ratings and Reviews Developers | Pending | ||
Review via email: mp+118552@code.staging.launchpad.net |
Commit message
Switch rnr txtstatsd client from pystatsd to txstatsd's own client.
Description of the change
Overview
==========
This branch switches the client code for txstatsd server from pystatsd to txstatsd's client.
Details
=========
txstatsd is being brought in as a symlinked branch so that it does not need to be installed (thus avoiding installation of twisted). The stats need a little bit of formatting now as this client doesn't provide it directly. I tested the results in graphite and they looked identical to the ones previously being sent. The tests had to be changed to accommodate for the new formatting in the method being mocked.
Re-pushing Danny's branch with a small update to the config file.
Testing
========
$ fab test