timeoutMs

Author: kp-cat

include/configcat/configcatoptions.h

@@ -18,8 +18,8 @@ struct ProxyAuthentication {
 struct ConfigCatOptions {
     std::string baseUrl = "";
     DataGovernance dataGovernance = Global;
-    uint32_t connectTimeout = 8000; // milliseconds (0 means it never times out during transfer)
-    uint32_t readTimeout = 5000; // milliseconds (0 means it never times out during transfer)
+    uint32_t connectTimeoutMs = 8000; // milliseconds (0 means it never times out during transfer)
+    uint32_t readTimeoutMs = 5000; // milliseconds (0 means it never times out during transfer)
     std::shared_ptr<PollingMode> mode = PollingMode::autoPoll();
     std::shared_ptr<ConfigCatCache> cache;
     std::shared_ptr<FlagOverrides> override;

src/configfetcher.cpp

@@ -48,14 +48,14 @@ class SessionInterceptor : public cpr::Interceptor {
 ConfigFetcher::ConfigFetcher(const string& sdkKey, const string& mode, const ConfigCatOptions& options):
     sdkKey(sdkKey),
     mode(mode),
-    connectTimeout(options.connectTimeout),
-    readTimeout(options.readTimeout) {
+    connectTimeoutMs(options.connectTimeoutMs),
+    readTimeoutMs(options.readTimeoutMs) {
     if (options.httpSessionAdapter) {
         sessionInterceptor = make_shared<SessionInterceptor>(options.httpSessionAdapter);
     }
     session = make_unique<cpr::Session>();
-    session->SetConnectTimeout(connectTimeout);
-    session->SetTimeout(readTimeout);
+    session->SetConnectTimeout(connectTimeoutMs);
+    session->SetTimeout(readTimeoutMs);
     session->SetProxies(options.proxies);
     std::map<std::string, cpr::EncodedAuthentication> proxyAuthentications;
     for (auto& keyValue : options.proxyAuthentications) {
@@ -159,7 +159,7 @@ FetchResponse ConfigFetcher::fetch(const std::string& eTag) {
         LogEntry logEntry(LOG_LEVEL_ERROR);
         logEntry << "An error occurred during the config fetch: " << response.error.message << ".";
         if (response.error.code == cpr::ErrorCode::OPERATION_TIMEDOUT) {
-            logEntry << " Timeout values: [connect: " << connectTimeout << "ms, read: " << readTimeout << "ms]";
+            logEntry << " Timeout values: [connect: " << connectTimeoutMs << "ms, read: " << readTimeoutMs << "ms]";
         }
         return FetchResponse({failure, ConfigEntry::empty});
     }

src/configfetcher.h

@@ -59,8 +59,8 @@ class ConfigFetcher {
 
     std::string sdkKey;
     std::string mode;
-    uint32_t connectTimeout; // milliseconds (0 means it never times out during transfer)
-    uint32_t readTimeout; // milliseconds (0 means it never times out during transfer)
+    uint32_t connectTimeoutMs; // milliseconds (0 means it never times out during transfer)
+    uint32_t readTimeoutMs; // milliseconds (0 means it never times out during transfer)
     std::shared_ptr<SessionInterceptor> sessionInterceptor;
     std::unique_ptr<cpr::Session> session;
     bool urlIsCustom = false;

src/version.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define CONFIGCAT_VERSION "0.1.0"
+#define CONFIGCAT_VERSION "1.0.0"

test/test-configcatclientintegration.cpp

@@ -9,8 +9,8 @@ using namespace std;
 TEST(ConfigCatClientIntegrationTest, RequestTimeout) {
     ConfigCatOptions options;
     options.mode = PollingMode::autoPoll(120);
-    options.connectTimeout = 1; // milliseconds
-    options.readTimeout = 1; // milliseconds
+    options.connectTimeoutMs = 1; // milliseconds
+    options.readTimeoutMs = 1; // milliseconds
     auto client = ConfigCatClient::get("PKDVCLf-Hq-h-kCzMp-L7Q/psuH7BGHoUmdONrzzUOY7A", options);
     auto startTime = chrono::steady_clock::now();