diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst index 67d8ccb..aab5f4c 100644 --- a/docs/source/configuration.rst +++ b/docs/source/configuration.rst @@ -28,7 +28,7 @@ NAME Default Description ================================== ============== ============================================================================================================= .. hint:: - Any parameter accepted by `the graphitesend client`_ is also valid when + Any parameter accepted by `the graphitesender client`_ is also valid when prefixed with ``FLASK_GRAPHITE_``. -.. _`the graphitesend client`: https://github.com/daniellawrence/graphitesend +.. _`the graphitesender client`: https://github.com/Shir0kamii/graphitesender diff --git a/flask_graphite/__init__.py b/flask_graphite/__init__.py index b3b40d4..1af7a46 100644 --- a/flask_graphite/__init__.py +++ b/flask_graphite/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import logging -from graphitesend.graphitesend import GraphiteClient, GraphiteSendException +from graphitesend import GraphiteClient, GraphiteSendException from .hooks import MetricHook from .request_hooks import default_hooks @@ -45,10 +45,9 @@ def init_app(self, app): try: app.graphite = GraphiteClient(**config) except GraphiteSendException as e: - logger.error("can't instanciate graphite client: {}".format(e)) + logger.error("can't instantiate graphite client: {}".format(e)) else: - logger.info("graphite client instantiated with config: %s", - config) + logger.info("graphite client instantiated with config: %s", config) for hook in default_hooks: hook.register_into(app) diff --git a/flask_graphite/hooks.py b/flask_graphite/hooks.py index 94a0f9d..ee67a21 100644 --- a/flask_graphite/hooks.py +++ b/flask_graphite/hooks.py @@ -1,7 +1,7 @@ import logging from flask import current_app -from graphitesend.graphitesend import GraphiteSendException +from graphitesend import GraphiteSendException from .utils import get_request_metric_prefix diff --git a/requirements.txt b/requirements.txt index 1f50218..4f95c4d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ flask -graphitesend +graphitesender flake8 flake8-isort diff --git a/setup.py b/setup.py index c60d5c1..8ba4ae0 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ def get_description(): platform='any', install_requires=[ 'Flask>=0.12', - 'graphitesend>=0.10.0' + 'graphitesender>=0.11.2' ], classifiers=[ 'Environment :: Web Environment', diff --git a/tests/conftest.py b/tests/conftest.py index 7b8fe22..c6bc569 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,5 +1,5 @@ import flask -import graphitesend.graphitesend +import graphitesend import pytest from flask_graphite import FlaskGraphite @@ -30,6 +30,6 @@ def mocked_app(mocker, plugged_app): @pytest.fixture def graphitesend_client(mocker): - client = graphitesend.graphitesend.GraphiteClient(dryrun=True) + client = graphitesend.GraphiteClient(dryrun=True) mocker.patch.object(client, "send") return client