Merge branch 'release/v1.1.12'

Tinkoff · Sep 24, 2021 · aa9303a · aa9303a
2 parents f126e40 + 190a904
commit aa9303a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/.github/workflows/run.sh b/.github/workflows/run.sh
@@ -51,6 +51,7 @@ if [[ "$1" == "test" ]] ; then
     build_testing "build-tsan" "Tsan"
     build_testing "build-asan" "Asan"
     build_testing "build-ubsan" "Ubsan"
+    build_testing "build" "Debug"
 
 elif [[ "$1" == "coverage" ]] ; then
     build_testing "build" "Debug"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 1.1.12 (2021-09-21)
+
+### Bug Fixes
+
+* connector::base_connector: fix resolving thread spooling if attemts failed
+
+### Misc
+
+* Fix github 'lint' action on PRs
+
+
 ## 1.1.11 (2021-08-20)
 
 ### Bug Fixes

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
 set(STREAMCLIENT_VERSION_MAJOR "1")
 set(STREAMCLIENT_VERSION_MINOR "1")
-set(STREAMCLIENT_VERSION_RELEASE "11")
+set(STREAMCLIENT_VERSION_RELEASE "12")
 set(STREAMCLIENT_SUMMARY "C++ library")
 set(STREAMCLIENT_REPOSITORY_URL "https://github.com/TinkoffCreditSystems/stream-client")
 set(STREAMCLIENT_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")

diff --git a/include/stream-client/connector/impl/connector.ipp b/include/stream-client/connector/impl/connector.ipp
@@ -101,6 +101,7 @@ void base_connector<Stream>::resolve_routine()
         resolver_endpoint_iterator_type new_endpoints = resolver_.resolve(resolve_ec);
         set_resolve_error(resolve_ec);
         if (resolve_ec) {
+            std::this_thread::sleep_for(std::chrono::milliseconds(50));
             continue;
         }