##// END OF EJS Templates
fix: fixed logging in archive-cache
fix: fixed logging in archive-cache

File last commit:

r1249:5745b11f default
r1258:4a8b96ae default
Show More
request_wrapper.py
123 lines | 4.1 KiB | text/x-python | PythonLexer
request-wrapper: set custom module for better logging.
r744 # RhodeCode VCSServer provides access to different vcs backends via network.
source-code: updated copyrights to 2023
r1126 # Copyright (C) 2014-2023 RhodeCode GmbH
request-wrapper: set custom module for better logging.
r744 #
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
app: new optimized remote endpoints for python3 rewrite
r1124 import base64
core: renamed remote packages to prevent conflicts with builtin libraries like svn core library called same as svn remote
r1145 import logging
request-wrapper: set custom module for better logging.
r744 import time
app: new optimized remote endpoints for python3 rewrite
r1124 import msgpack
request-wrapper: show version for vcsserver in logs.
r777 import vcsserver
core: moved str_utils and type_utils to lib so it's consistent with ce, and easier to sync up codebases
r1249 from vcsserver.lib.str_utils import safe_str
request-wrapper: set custom module for better logging.
r744
log = logging.getLogger(__name__)
metrics: use new statsd client logic, and start gathering new metrics
r1005 def get_access_path(environ):
path = environ.get('PATH_INFO')
return path
request-wrapper: set custom module for better logging.
r744
def get_user_agent(environ):
return environ.get('HTTP_USER_AGENT')
app: new optimized remote endpoints for python3 rewrite
r1124 def get_call_context(request) -> dict:
http-traffic: mostly use payload from encoded msgpack single header instead of multiple ones....
r1078 cc = {}
app: new optimized remote endpoints for python3 rewrite
r1124 registry = request.registry
http-traffic: mostly use payload from encoded msgpack single header instead of multiple ones....
r1078 if hasattr(registry, 'vcs_call_context'):
cc.update({
'X-RC-Method': registry.vcs_call_context.get('method'),
'X-RC-Repo-Name': registry.vcs_call_context.get('repo_name')
})
request-tracker: expose more info about repo-name/method in tracking calls
r1031
http-traffic: mostly use payload from encoded msgpack single header instead of multiple ones....
r1078 return cc
request-tracker: expose more info about repo-name/method in tracking calls
r1031
app: new optimized remote endpoints for python3 rewrite
r1124 def get_headers_call_context(environ, strict=True):
if 'HTTP_X_RC_VCS_STREAM_CALL_CONTEXT' in environ:
packed_cc = base64.b64decode(environ['HTTP_X_RC_VCS_STREAM_CALL_CONTEXT'])
return msgpack.unpackb(packed_cc)
elif strict:
raise ValueError('Expected header HTTP_X_RC_VCS_STREAM_CALL_CONTEXT not found')
lint: auto-fixes
r1152 class RequestWrapperTween:
request-wrapper: set custom module for better logging.
r744 def __init__(self, handler, registry):
self.handler = handler
self.registry = registry
# one-time configuration code goes here
def __call__(self, request):
start = time.time()
application: added statsd client for sending usage statistics.
r920 log.debug('Starting request time measurement')
logging: update request wrapper to expose additional data points
r1017 response = None
request-tracker: expose more info about repo-name/method in tracking calls
r1031
request-wrapper: set custom module for better logging.
r744 try:
response = self.handler(request)
finally:
http-traffic: mostly use payload from encoded msgpack single header instead of multiple ones....
r1078 ua = get_user_agent(request.environ)
app: new optimized remote endpoints for python3 rewrite
r1124 call_context = get_call_context(request)
http-traffic: mostly use payload from encoded msgpack single header instead of multiple ones....
r1078 vcs_method = call_context.get('X-RC-Method', '_NO_VCS_METHOD')
repo_name = call_context.get('X-RC-Repo-Name', '')
request-wrapper: add request counter.
r756 count = request.request_count()
fix(core): don't rely on pkgutil to extract the version info of project
r1188 _ver_ = vcsserver.get_version()
metrics: use new statsd client logic, and start gathering new metrics
r1005 _path = safe_str(get_access_path(request.environ))
http-traffic: mostly use payload from encoded msgpack single header instead of multiple ones....
r1078
logging: update request wrapper to expose additional data points
r1017 ip = '127.0.0.1'
match_route = request.matched_route.name if request.matched_route else "NOT_FOUND"
metrics: expose response code to logs
r1020 resp_code = getattr(response, 'status_code', 'UNDEFINED')
metrics: use new statsd client logic, and start gathering new metrics
r1005
http-traffic: mostly use payload from encoded msgpack single header instead of multiple ones....
r1078 _view_path = f"{repo_name}@{_path}/{vcs_method}"
application: added statsd client for sending usage statistics.
r920 total = time.time() - start
request-tracker: expose more info about repo-name/method in tracking calls
r1031
request-wrapper: set custom module for better logging.
r744 log.info(
request-wrapper: show version for vcsserver in logs.
r777 'Req[%4s] IP: %s %s Request to %s time: %.4fs [%s], VCSServer %s',
logging: update request wrapper to expose additional data points
r1017 count, ip, request.environ.get('REQUEST_METHOD'),
request-tracker: expose more info about repo-name/method in tracking calls
r1031 _view_path, total, ua, _ver_,
metrics: expose response code to logs
r1020 extra={"time": total, "ver": _ver_, "code": resp_code,
request-tracker: expose more info about repo-name/method in tracking calls
r1031 "path": _path, "view_name": match_route, "user_agent": ua,
"vcs_method": vcs_method, "repo_name": repo_name}
application: added statsd client for sending usage statistics.
r920 )
request-wrapper: set custom module for better logging.
r744
metrics: use new statsd client logic, and start gathering new metrics
r1005 statsd = request.registry.statsd
if statsd:
metrics: updated statsd client and fixed some metrics
r1013 match_route = request.matched_route.name if request.matched_route else _path
elapsed_time_ms = round(1000.0 * total) # use ms only
metrics: use new statsd client logic, and start gathering new metrics
r1005 statsd.timing(
metrics: updated statsd client and fixed some metrics
r1013 "vcsserver_req_timing.histogram", elapsed_time_ms,
tags=[
vcsserver: modernize code for python3
r1130 f"view_name:{match_route}",
f"code:{resp_code}"
metrics: updated statsd client and fixed some metrics
r1013 ],
use_decimals=False
metrics: use new statsd client logic, and start gathering new metrics
r1005 )
statsd.incr(
metrics: updated statsd client and fixed some metrics
r1013 "vcsserver_req_total", tags=[
vcsserver: modernize code for python3
r1130 f"view_name:{match_route}",
f"code:{resp_code}"
metrics: updated statsd client and fixed some metrics
r1013 ])
request-tracker: expose more info about repo-name/method in tracking calls
r1031
request-wrapper: set custom module for better logging.
r744 return response
def includeme(config):
config.add_tween(
'vcsserver.tweens.request_wrapper.RequestWrapperTween',
)