diff --git a/.gitignore b/.gitignore index f45a563..fb29c34 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,4 @@ compile_commands.json .ccache/ cmake-build-* Testing/ -configs/config_vars.yaml .DS_Store diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fc7645..5e52d19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}) diff --git a/Makefile b/Makefile index bac0051..99a54cf 100644 --- a/Makefile +++ b/Makefile @@ -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/ diff --git a/configs/config_vars.template.yaml b/configs/config_vars.template.yaml deleted file mode 100644 index c54fc29..0000000 --- a/configs/config_vars.template.yaml +++ /dev/null @@ -1,9 +0,0 @@ -worker-threads: 4 -worker-fs-threads: 2 -logger-level: debug - -is_testing: false - -server-port: 8080 - -config-fallback-path: @CONFIG_FALLBACK_PATH@ diff --git a/configs/static_config.yaml b/configs/static_config.yaml index 069a2e0..df08b3b 100644 --- a/configs/static_config.yaml +++ b/configs/static_config.yaml @@ -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: {} diff --git a/third_party/userver b/third_party/userver index e1fbef5..d89f688 160000 --- a/third_party/userver +++ b/third_party/userver @@ -1 +1 @@ -Subproject commit e1fbef56a94052f37e9fcde7d6fb91590431d7d2 +Subproject commit d89f68897136ce79c188579a98f00fda0b55c111