Merge branch 'sh-filter-geo-output' into 'master'
Filter Geo proxied data from api_json.log See merge request gitlab-org/gitlab-ce!30687
This commit is contained in:
commit
03c307b6fa
|
@ -10,13 +10,14 @@ module API
|
||||||
NAMESPACE_OR_PROJECT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze
|
NAMESPACE_OR_PROJECT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze
|
||||||
COMMIT_ENDPOINT_REQUIREMENTS = NAMESPACE_OR_PROJECT_REQUIREMENTS.merge(sha: NO_SLASH_URL_PART_REGEX).freeze
|
COMMIT_ENDPOINT_REQUIREMENTS = NAMESPACE_OR_PROJECT_REQUIREMENTS.merge(sha: NO_SLASH_URL_PART_REGEX).freeze
|
||||||
USER_REQUIREMENTS = { user_id: NO_SLASH_URL_PART_REGEX }.freeze
|
USER_REQUIREMENTS = { user_id: NO_SLASH_URL_PART_REGEX }.freeze
|
||||||
|
LOG_FILTERS = ::Rails.application.config.filter_parameters + [/^output$/]
|
||||||
|
|
||||||
insert_before Grape::Middleware::Error,
|
insert_before Grape::Middleware::Error,
|
||||||
GrapeLogging::Middleware::RequestLogger,
|
GrapeLogging::Middleware::RequestLogger,
|
||||||
logger: Logger.new(LOG_FILENAME),
|
logger: Logger.new(LOG_FILENAME),
|
||||||
formatter: Gitlab::GrapeLogging::Formatters::LogrageWithTimestamp.new,
|
formatter: Gitlab::GrapeLogging::Formatters::LogrageWithTimestamp.new,
|
||||||
include: [
|
include: [
|
||||||
GrapeLogging::Loggers::FilterParameters.new,
|
GrapeLogging::Loggers::FilterParameters.new(LOG_FILTERS),
|
||||||
GrapeLogging::Loggers::ClientEnv.new,
|
GrapeLogging::Loggers::ClientEnv.new,
|
||||||
Gitlab::GrapeLogging::Loggers::RouteLogger.new,
|
Gitlab::GrapeLogging::Loggers::RouteLogger.new,
|
||||||
Gitlab::GrapeLogging::Loggers::UserLogger.new,
|
Gitlab::GrapeLogging::Loggers::UserLogger.new,
|
||||||
|
|
Loading…
Reference in New Issue