Skip to content
Snippets Groups Projects
Commit eacb57a2 authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files

Merge branch 'build-no-asan-in-release' into 'develop'

feat(docker): release mode does not use anymore libasan

See merge request !9
parents a2dc7a12 e9f88f55
No related branches found
Tags v1.5-rc
1 merge request!9feat(docker): release mode does not use anymore libasan
Pipeline #33612 passed
......@@ -64,7 +64,7 @@ RUN apt-get update && \
# Ubuntu 18 --> libasan4
# Ubuntu 20 --> libasan5
# Ubuntu 22 --> libasan6
libasan? \
# libasan? \
libconfig++9v5 \
# Ubuntu 18 --> libnettle6
# Ubuntu 20 --> libnettle7
......
......@@ -90,7 +90,7 @@ RUN rm -f /etc/rhsm-host && \
microdnf update -y && \
microdnf install -y \
tzdata \
libasan \
# libasan \
procps-ng \
psmisc \
net-tools \
......
......@@ -85,7 +85,7 @@ RUN apt-get update && \
# Ubuntu 18 --> libasan4
# Ubuntu 20 --> libasan5
# Ubuntu 22 --> libasan6
libasan? \
# libasan? \
libconfig++9v5 \
# Ubuntu 18 --> libnettle6
# Ubuntu 20 --> libnettle7
......
......@@ -125,7 +125,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
SET(ASAN asan)
endif()
if (CMAKE_BUILD_TYPE STREQUAL "Release")
SET(ASAN asan)
Message("no more asan in Release Mode")
endif()
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
add_boolean_option(LOG_OAI True "Thread safe logging API")
......
......@@ -80,11 +80,8 @@ int main(int argc, char** argv) {
Logger::init("nef", Options::getlogStdout(), Options::getlogRotFilelog());
Logger::nef_app().startup("Options parsed");
struct sigaction sigIntHandler;
sigIntHandler.sa_handler = my_app_signal_handler;
sigemptyset(&sigIntHandler.sa_mask);
sigIntHandler.sa_flags = 0;
sigaction(SIGINT, &sigIntHandler, NULL);
std::signal(SIGTERM, my_app_signal_handler);
std::signal(SIGINT, my_app_signal_handler);
// Config
nef_cfg.load(Options::getlibconfigConfig());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment