Merge pull request #19237 from ghalliday/issue32877

HPCC-32877 Fix abort in esp when accessing secrets from a vault Reviewed-by: Mark Kelly [email protected] Reviewed-by: Jake Smith <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Oct 25, 2024 · 1ceec04 · 1ceec04
2 parents dd68be7 + b5e1b18
commit 1ceec04
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/system/jlib/CMakeLists.txt b/system/jlib/CMakeLists.txt
@@ -223,6 +223,9 @@ include_directories (
          ${CMAKE_BINARY_DIR}/oss
     )
 
+# ensure httplib uses poll rather than select - otherwise it fail if too many sockets have been opened.
+ADD_DEFINITIONS( -DCPPHTTPLIB_USE_POLL )
+
 ADD_DEFINITIONS( -D_USRDLL -DJLIB_EXPORTS )
 HPCC_ADD_LIBRARY( jlib SHARED ${SRCS} ${INCLUDES} )
 

diff --git a/system/metrics/sinks/prometheus/CMakeLists.txt b/system/metrics/sinks/prometheus/CMakeLists.txt
@@ -30,6 +30,9 @@ include_directories(
         ${HPCC_SOURCE_DIR}/system/httplib
 )
 
+# ensure httplib uses poll rather than select - otherwise it fail if too many sockets have been opened.
+ADD_DEFINITIONS( -DCPPHTTPLIB_USE_POLL )
+
 SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STRICT_CXX_FLAGS}")
 ADD_DEFINITIONS(  -DPROMETHEUSSINK_EXPORTS )
 HPCC_ADD_LIBRARY( hpccmetrics_prometheussink SHARED ${srcs} )