Merge branch 'hotfix/2.10.1'

driplineorg · Jan 14, 2025 · 88e23fa · 88e23fa
2 parents 5ee2056 + 86d3079
commit 88e23fa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required (VERSION 3.12)
 #########
 
 cmake_policy( SET CMP0048 NEW ) # version in project()
-project( Dripline VERSION 2.10.0 )
+project( Dripline VERSION 2.10.1 )
 
 list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/scarab/cmake )
 
@@ -33,8 +33,8 @@ set ( Dripline_PYTHON_THROW_REPLY_KEYWORD "ThrowReply" CACHE STRING "Keyword use
 
 set( Dripline_MAX_PAYLOAD_SIZE "10000" CACHE STRING "Maximum payload size (bytes)" )
 
-# always use C++17
-set( CMAKE_CXX_STANDARD 17 )
+# always use C++17 or higher
+set_to_max( CMAKE_CXX_STANDARD 17 )
 
 # This can be used to debug memory issues
 #add_compile_options(-fsanitize=address)

diff --git a/library/service.cc b/library/service.cc
@@ -45,7 +45,6 @@ namespace dripline
             f_async_children(),
             f_broadcast_key( a_config.get_value( "broadcast_key", "broadcast" ) )
     {
-        LWARN( dlog, "Service (cpp) constructor" );
         LDEBUG( dlog, "Service (cpp) created with config:\n" << a_config );
         // get more values from the config
         // default of f_listen_timeout_ms is in the listener class

diff --git a/scarab b/scarab
+2 −0		CMakeLists.txt
+1 −1		VERSION
+1 −0		cmake/PackageBuilder.cmake
+9 −2		cmake/PackageBuilderMacros.cmake
+1 −1		library/utility/cancelable.hh
+11 −0		library/utility/signal_handler.cc
+3 −1		library/utility/signal_handler.hh
+0 −23		library/utility/typename.cc
+28 −1		python/cancelable_pybind.hh
+36 −2		python/logging_pybind.hh
+3 −0		python/scarab_namespace_pybind.cc
+1 −0		python/signal_handler_pybind.hh
+16 −0		testing/python/test_logging.py