diff --git a/development.ini b/development.ini --- a/development.ini +++ b/development.ini @@ -387,59 +387,59 @@ beaker.session.secret = development-not- ############################ #################### -### [errormator] ### +### [appenlight] ### #################### -## Errormator is tailored to work with Kallithea, see -## http://errormator.com for details how to obtain an account -## you must install python package `errormator_client` to make it work +## AppEnlight is tailored to work with Kallithea, see +## http://appenlight.com for details how to obtain an account +## you must install python package `appenlight_client` to make it work -## errormator enabled -errormator = false +## appenlight enabled +appenlight = false -errormator.server_url = https://api.errormator.com -errormator.api_key = YOUR_API_KEY +appenlight.server_url = https://api.appenlight.com +appenlight.api_key = YOUR_API_KEY ## TWEAK AMOUNT OF INFO SENT HERE ## enables 404 error logging (default False) -errormator.report_404 = false +appenlight.report_404 = false ## time in seconds after request is considered being slow (default 1) -errormator.slow_request_time = 1 +appenlight.slow_request_time = 1 ## record slow requests in application ## (needs to be enabled for slow datastore recording and time tracking) -errormator.slow_requests = true +appenlight.slow_requests = true ## enable hooking to application loggers -#errormator.logging = true +#appenlight.logging = true ## minimum log level for log capture -#errormator.logging.level = WARNING +#appenlight.logging.level = WARNING ## send logs only from erroneous/slow requests ## (saves API quota for intensive logging) -errormator.logging_on_error = false +appenlight.logging_on_error = false ## list of additonal keywords that should be grabbed from environ object ## can be string with comma separated list of words in lowercase ## (by default client will always send following info: ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that ## start with HTTP* this list be extended with additional keywords here -errormator.environ_keys_whitelist = +appenlight.environ_keys_whitelist = ## list of keywords that should be blanked from request object ## can be string with comma separated list of words in lowercase ## (by default client will always blank keys that contain following words ## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf' ## this list be extended with additional keywords set here -errormator.request_keys_blacklist = +appenlight.request_keys_blacklist = ## list of namespaces that should be ignores when gathering log entries ## can be string with comma separated list of namespaces -## (by default the client ignores own entries: errormator_client.client) -errormator.log_namespace_blacklist = +## (by default the client ignores own entries: appenlight_client.client) +appenlight.log_namespace_blacklist = ################ ### [sentry] ### diff --git a/kallithea/bin/template.ini.mako b/kallithea/bin/template.ini.mako --- a/kallithea/bin/template.ini.mako +++ b/kallithea/bin/template.ini.mako @@ -380,65 +380,65 @@ beaker.session.secret = ${uuid()} #beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea #beaker.session.table_name = db_session -%if error_aggregation_service == 'errormator': +%if error_aggregation_service == 'appenlight': <%text>############################ <%text>## ERROR HANDLING SYSTEMS ## <%text>############################ <%text>#################### -<%text>### [errormator] ### +<%text>### [appenlight] ### <%text>#################### -<%text>## Errormator is tailored to work with Kallithea, see -<%text>## http://errormator.com for details how to obtain an account -<%text>## you must install python package `errormator_client` to make it work +<%text>## AppEnlight is tailored to work with Kallithea, see +<%text>## http://appenlight.com for details how to obtain an account +<%text>## you must install python package `appenlight_client` to make it work -<%text>## errormator enabled -errormator = false +<%text>## appenlight enabled +appenlight = false -errormator.server_url = https://api.errormator.com -errormator.api_key = YOUR_API_KEY +appenlight.server_url = https://api.appenlight.com +appenlight.api_key = YOUR_API_KEY <%text>## TWEAK AMOUNT OF INFO SENT HERE <%text>## enables 404 error logging (default False) -errormator.report_404 = false +appenlight.report_404 = false <%text>## time in seconds after request is considered being slow (default 1) -errormator.slow_request_time = 1 +appenlight.slow_request_time = 1 <%text>## record slow requests in application <%text>## (needs to be enabled for slow datastore recording and time tracking) -errormator.slow_requests = true +appenlight.slow_requests = true <%text>## enable hooking to application loggers -#errormator.logging = true +#appenlight.logging = true <%text>## minimum log level for log capture -#errormator.logging.level = WARNING +#appenlight.logging.level = WARNING <%text>## send logs only from erroneous/slow requests <%text>## (saves API quota for intensive logging) -errormator.logging_on_error = false +appenlight.logging_on_error = false <%text>## list of additonal keywords that should be grabbed from environ object <%text>## can be string with comma separated list of words in lowercase <%text>## (by default client will always send following info: <%text>## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that <%text>## start with HTTP* this list be extended with additional keywords here -errormator.environ_keys_whitelist = +appenlight.environ_keys_whitelist = <%text>## list of keywords that should be blanked from request object <%text>## can be string with comma separated list of words in lowercase <%text>## (by default client will always blank keys that contain following words <%text>## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf' <%text>## this list be extended with additional keywords set here -errormator.request_keys_blacklist = +appenlight.request_keys_blacklist = <%text>## list of namespaces that should be ignores when gathering log entries <%text>## can be string with comma separated list of namespaces -<%text>## (by default the client ignores own entries: errormator_client.client) -errormator.log_namespace_blacklist = +<%text>## (by default the client ignores own entries: appenlight_client.client) +appenlight.log_namespace_blacklist = %elif error_aggregation_service == 'sentry': <%text>################ diff --git a/kallithea/config/deployment.ini_tmpl b/kallithea/config/deployment.ini_tmpl --- a/kallithea/config/deployment.ini_tmpl +++ b/kallithea/config/deployment.ini_tmpl @@ -381,59 +381,59 @@ beaker.session.secret = ${app_instance_u ############################ #################### -### [errormator] ### +### [appenlight] ### #################### -## Errormator is tailored to work with Kallithea, see -## http://errormator.com for details how to obtain an account -## you must install python package `errormator_client` to make it work +## AppEnlight is tailored to work with Kallithea, see +## http://appenlight.com for details how to obtain an account +## you must install python package `appenlight_client` to make it work -## errormator enabled -errormator = false +## appenlight enabled +appenlight = false -errormator.server_url = https://api.errormator.com -errormator.api_key = YOUR_API_KEY +appenlight.server_url = https://api.appenlight.com +appenlight.api_key = YOUR_API_KEY ## TWEAK AMOUNT OF INFO SENT HERE ## enables 404 error logging (default False) -errormator.report_404 = false +appenlight.report_404 = false ## time in seconds after request is considered being slow (default 1) -errormator.slow_request_time = 1 +appenlight.slow_request_time = 1 ## record slow requests in application ## (needs to be enabled for slow datastore recording and time tracking) -errormator.slow_requests = true +appenlight.slow_requests = true ## enable hooking to application loggers -#errormator.logging = true +#appenlight.logging = true ## minimum log level for log capture -#errormator.logging.level = WARNING +#appenlight.logging.level = WARNING ## send logs only from erroneous/slow requests ## (saves API quota for intensive logging) -errormator.logging_on_error = false +appenlight.logging_on_error = false ## list of additonal keywords that should be grabbed from environ object ## can be string with comma separated list of words in lowercase ## (by default client will always send following info: ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that ## start with HTTP* this list be extended with additional keywords here -errormator.environ_keys_whitelist = +appenlight.environ_keys_whitelist = ## list of keywords that should be blanked from request object ## can be string with comma separated list of words in lowercase ## (by default client will always blank keys that contain following words ## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf' ## this list be extended with additional keywords set here -errormator.request_keys_blacklist = +appenlight.request_keys_blacklist = ## list of namespaces that should be ignores when gathering log entries ## can be string with comma separated list of namespaces -## (by default the client ignores own entries: errormator_client.client) -errormator.log_namespace_blacklist = +## (by default the client ignores own entries: appenlight_client.client) +appenlight.log_namespace_blacklist = ################ ### [sentry] ### diff --git a/kallithea/config/middleware.py b/kallithea/config/middleware.py --- a/kallithea/config/middleware.py +++ b/kallithea/config/middleware.py @@ -70,9 +70,9 @@ def make_app(global_conf, full_stack=Tru if asbool(full_stack): from kallithea.lib.middleware.sentry import Sentry - from kallithea.lib.middleware.errormator import Errormator - if Errormator and asbool(config['app_conf'].get('errormator')): - app = Errormator(app, config) + from kallithea.lib.middleware.appenlight import AppEnlight + if AppEnlight and asbool(config['app_conf'].get('appenlight')): + app = AppEnlight(app, config) elif Sentry: app = Sentry(app, config) diff --git a/kallithea/lib/middleware/errormator.py b/kallithea/lib/middleware/appenlight.py rename from kallithea/lib/middleware/errormator.py rename to kallithea/lib/middleware/appenlight.py --- a/kallithea/lib/middleware/errormator.py +++ b/kallithea/lib/middleware/appenlight.py @@ -12,10 +12,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . """ -kallithea.lib.middleware.errormator +kallithea.lib.middleware.appenlight ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -middleware to handle errormator publishing of errors +middleware to handle appenlight publishing of errors This file was forked by the Kallithea project in July 2014. Original author and date, and relevant copyright and licensing information is below: @@ -27,8 +27,8 @@ Original author and date, and relevant c try: - from errormator_client import make_errormator_middleware + from appenlight_client import make_appenlight_middleware except ImportError: - Errormator = None + AppEnlight = None else: - Errormator = make_errormator_middleware + AppEnlight = make_appenlight_middleware diff --git a/kallithea/tests/test.ini b/kallithea/tests/test.ini --- a/kallithea/tests/test.ini +++ b/kallithea/tests/test.ini @@ -387,59 +387,59 @@ beaker.session.secret = {74e0cd75-b339-4 ############################ #################### -### [errormator] ### +### [appenlight] ### #################### -## Errormator is tailored to work with Kallithea, see -## http://errormator.com for details how to obtain an account -## you must install python package `errormator_client` to make it work +## AppEnlight is tailored to work with Kallithea, see +## http://appenlight.com for details how to obtain an account +## you must install python package `appenlight_client` to make it work -## errormator enabled -errormator = false +## appenlight enabled +appenlight = false -errormator.server_url = https://api.errormator.com -errormator.api_key = YOUR_API_KEY +appenlight.server_url = https://api.appenlight.com +appenlight.api_key = YOUR_API_KEY ## TWEAK AMOUNT OF INFO SENT HERE ## enables 404 error logging (default False) -errormator.report_404 = false +appenlight.report_404 = false ## time in seconds after request is considered being slow (default 1) -errormator.slow_request_time = 1 +appenlight.slow_request_time = 1 ## record slow requests in application ## (needs to be enabled for slow datastore recording and time tracking) -errormator.slow_requests = true +appenlight.slow_requests = true ## enable hooking to application loggers -#errormator.logging = true +#appenlight.logging = true ## minimum log level for log capture -#errormator.logging.level = WARNING +#appenlight.logging.level = WARNING ## send logs only from erroneous/slow requests ## (saves API quota for intensive logging) -errormator.logging_on_error = false +appenlight.logging_on_error = false ## list of additonal keywords that should be grabbed from environ object ## can be string with comma separated list of words in lowercase ## (by default client will always send following info: ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that ## start with HTTP* this list be extended with additional keywords here -errormator.environ_keys_whitelist = +appenlight.environ_keys_whitelist = ## list of keywords that should be blanked from request object ## can be string with comma separated list of words in lowercase ## (by default client will always blank keys that contain following words ## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf' ## this list be extended with additional keywords set here -errormator.request_keys_blacklist = +appenlight.request_keys_blacklist = ## list of namespaces that should be ignores when gathering log entries ## can be string with comma separated list of namespaces -## (by default the client ignores own entries: errormator_client.client) -errormator.log_namespace_blacklist = +## (by default the client ignores own entries: appenlight_client.client) +appenlight.log_namespace_blacklist = ################ ### [sentry] ### diff --git a/scripts/manifest b/scripts/manifest --- a/scripts/manifest +++ b/scripts/manifest @@ -338,7 +338,7 @@ kallithea/lib/ipaddr.py kallithea/lib/markup_renderer.py kallithea/lib/middleware/ kallithea/lib/middleware/__init__.py -kallithea/lib/middleware/errormator.py +kallithea/lib/middleware/appenlight.py kallithea/lib/middleware/https_fixup.py kallithea/lib/middleware/pygrack.py kallithea/lib/middleware/sentry.py