Scarab update via Sandfly and Monarch

.github/workflows/build_and_publish.yaml

@@ -11,7 +11,7 @@ on:
 env:
   REGISTRY: ghcr.io
   BASE_IMG_REPO: ubuntu
-  BASE_IMG_TAG: 22.04
+  BASE_IMG_TAG: 24.04
   NARG: 2
 
 jobs:

Dockerfile

@@ -1,5 +1,5 @@
 ARG base_image=ubuntu
-ARG base_tag=22.04
+ARG base_tag=24.04
 
 # Base image with environment variables set
 FROM ${base_image}:${base_tag} AS base
@@ -23,10 +23,6 @@ ENV PATH="${PATH}:${PSYLLID_INSTALL_PREFIX}"
 # Build image with dev dependencies
 FROM base AS deps
 
-# use quill_checkout to specify a tag or branch name to checkout
-ARG quill_checkout=v8.1.1
-ENV QUILL_CHECKOUT=${quill_checkout}
-
 RUN apt-get update &&\
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
         build-essential \
@@ -44,16 +40,6 @@ RUN apt-get update &&\
         &&\
     apt-get clean &&\
     rm -rf /var/lib/apt/lists/* &&\
-    cd /usr/local &&\
-    git clone https://github.com/odygrd/quill.git &&\
-    cd quill &&\
-    git checkout ${QUILL_CHECKOUT} &&\
-    mkdir build &&\
-    cd build &&\
-    cmake .. &&\
-    make -j${narg} install &&\
-    cd / &&\
-    rm -rf /usr/local/quill &&\
     /bin/true
 
 # Build psyllid in the deps image
@@ -86,12 +72,12 @@ RUN apt-get update &&\
         build-essential \
         libssl3 \
         libfftw3-double3 \
-        libboost-chrono1.74.0 \
-        libboost-filesystem1.74.0 \
-        libboost-system1.74.0 \
-        libhdf5-cpp-103 \
+        libboost-chrono1.83.0t64 \
+        libboost-filesystem1.83.0 \
+        libboost-system1.83.0 \
+        libhdf5-cpp-103-1t64 \
         librabbitmq4 \
-        libyaml-cpp0.7 \
+        libyaml-cpp0.8 \
         rapidjson-dev \
         &&\
     apt-get clean &&\

source/applications/grab_packet.cc

@@ -201,15 +201,13 @@ int main( int argc, char** argv )
         // Parse CL options and run the application
         CLI11_PARSE( the_main, argc, argv );
 
-        STOP_LOGGING;
-
         return RETURN_SUCCESS;
     }
     catch( std::exception& e )
     {
         LERROR( plog, "Caught an exception: " << e.what() );
     }
-    STOP_LOGGING;
+
     return RETURN_ERROR;
 }
 

source/applications/psyllid.cc

@@ -50,7 +50,7 @@ int main( int argc, char** argv )
 
         // The main execution callback
         the_main.callback( [&](){ 
-                scarab::signal_handler t_sig_hand;
+                scarab::signal_handler t_sig_hand( true );
                 auto t_cwrap = scarab::wrap_cancelable( the_conductor );
                 t_sig_hand.add_cancelable( t_cwrap );
 
@@ -96,7 +96,5 @@ int main( int argc, char** argv )
         return_val = RETURN_ERROR;
     }
 
-    STOP_LOGGING;
-
     return return_val;
 }