Skip to content

Commit

Permalink
Fix review issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Anton3 committed Oct 31, 2023
1 parent 7136038 commit 19c4a7a
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 24 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ compile_commands.json
.ccache/
cmake-build-*
Testing/
configs/config_vars.yaml
.DS_Store
8 changes: 0 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,6 @@ if(DEFINED ENV{PREFIX})
set(CMAKE_INSTALL_PREFIX "${PREFIX_PATH}")
endif()

set(CONFIG_FALLBACK_PATH
"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}/dynamic_config_fallback.json")

configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/configs/config_vars.template.yaml"
"${CMAKE_CURRENT_SOURCE_DIR}/configs/config_vars.yaml"
)

file(GLOB CONFIGS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/configs/*.yaml ${CMAKE_CURRENT_SOURCE_DIR}/configs/*.json)

install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${PROJECT_NAME})
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ clean-debug clean-release: clean-%:
.PHONY: dist-clean
dist-clean:
@rm -rf build_*
@rm -f ./configs/config_vars.yaml
@rm -rf tests/__pycache__/
@rm -rf tests/.pytest_cache/

Expand Down
9 changes: 0 additions & 9 deletions configs/config_vars.template.yaml

This file was deleted.

7 changes: 3 additions & 4 deletions configs/static_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ components_manager:

# Dynamic config options. Cache is disabled, updates are disabled.
dynamic-config:
# Load config from dynamic_config_fallback.json file.
# For most of userver dynamic configs, defaults are used, some are overridden in the file.
# For most of userver dynamic configs, defaults are used, some are overridden here.
# See userver "dynamic config" docs for what configs exist.
defaults-path: $config-fallback-path
fs-task-processor: fs-task-processor
defaults:
HTTP_CLIENT_CONNECTION_POOL_SIZE: 1000

testsuite-support: {}

Expand Down
2 changes: 1 addition & 1 deletion third_party/userver
Submodule userver updated 679 files

0 comments on commit 19c4a7a

Please sign in to comment.