Add network verbose log output to file

Fix the CURLOPT_NOSIGNAL option is not set after reset

Relates-To: OCMAM-418

Signed-off-by: Mykhailo Kuchma <[email protected]>

Author: mykhailo-kuchma

olp-cpp-sdk-core/include/olp/core/http/NetworkInitializationSettings.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 HERE Europe B.V.
+ * Copyright (C) 2023-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,10 @@
 
 #pragma once
 
-#include "olp/core/CoreApi.h"
-#include "olp/core/http/CertificateSettings.h"
+#include <boost/optional/optional.hpp>
+
+#include <olp/core/CoreApi.h>
+#include <olp/core/http/CertificateSettings.h>
 
 namespace olp {
 namespace http {
@@ -38,6 +40,12 @@ struct CORE_API NetworkInitializationSettings {
    * @brief The custom certificate settings.
    */
   CertificateSettings certificate_settings;
+
+  /**
+   * @brief Enable the underlying implementation to produce additional logs.
+   * Note: This is EXPERIMENTAL settings, only CURL implementation supports it.
+   */
+  boost::optional<std::string> log_file_path;
 };
 
 }  // namespace http

olp-cpp-sdk-core/src/http/curl/NetworkCurl.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -296,7 +296,8 @@ NetworkCurl::NetworkCurl(NetworkInitializationSettings settings)
     : handles_(settings.max_requests_count),
       static_handle_count_(
           std::max(static_cast<size_t>(1u), settings.max_requests_count / 4u)),
-      certificate_settings_(std::move(settings.certificate_settings)) {
+      certificate_settings_(std::move(settings.certificate_settings)),
+      curl_log_path_(settings.log_file_path) {
   OLP_SDK_LOG_TRACE(kLogTag, "Created NetworkCurl with address="
                                  << this << ", handles_count="
                                  << settings.max_requests_count);
@@ -307,6 +308,17 @@ NetworkCurl::NetworkCurl(NetworkInitializationSettings settings)
                         static_cast<int>(error));
   }
 
+  if (curl_log_path_) {
+    auto err = fopen_s(&stderr_, curl_log_path_->c_str(), "w+");
+    if ( err != 0 ) {
+      OLP_SDK_LOG_ERROR(
+          kLogTag, "Failed to init curl logging, error: " << err);
+    } else {
+      OLP_SDK_LOG_INFO_F(kLogTag, "Curl logs enabled to file: %s",
+                         curl_log_path_->c_str());
+    }
+  }
+
 #ifdef OLP_SDK_CURL_HAS_SUPPORT_SSL_BLOBS
   SetupCertificateBlobs();
 #else
@@ -609,11 +621,11 @@ ErrorCode NetworkCurl::SendImplementation(
 
   CURL* curl_handle = handle->handle;
 
-  if (verbose_) {
+  curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1L);
+
+  if (stderr_ != nullptr) {
     curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 1L);
-    if (stderr_ != nullptr) {
-      curl_easy_setopt(curl_handle, CURLOPT_STDERR, stderr_);
-    }
+    curl_easy_setopt(curl_handle, CURLOPT_STDERR, stderr_);
   } else {
     curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 0L);
   }
@@ -830,7 +842,6 @@ NetworkCurl::RequestHandle* NetworkCurl::GetHandle(
                             "GetHandle - curl_easy_init failed, id=" << id);
           return nullptr;
         }
-        curl_easy_setopt(handle.handle, CURLOPT_NOSIGNAL, 1L);
       }
       handle.in_use = true;
       handle.callback = std::move(callback);

olp-cpp-sdk-core/src/http/curl/NetworkCurl.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -392,6 +392,9 @@ class NetworkCurl : public olp::http::Network,
   /// blobs so cURL does not need to copy them.
   CertificateSettings certificate_settings_;
 
+  /// The path to store CURL logs
+  boost::optional<std::string> curl_log_path_;
+
 #ifdef OLP_SDK_CURL_HAS_SUPPORT_SSL_BLOBS
   /// SSL certificate blobs.
   boost::optional<SslCertificateBlobs> ssl_certificates_blobs_;