Commit 4c73a0c2 authored by Raphael Defosseux's avatar Raphael Defosseux

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

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

See merge request oai/cn5g/oai-cn5g-amf!168
parents 6d2446b7 75fedd95
......@@ -67,7 +67,7 @@ RUN apt-get update && \
# Ubuntu 18 --> libasan4
# Ubuntu 20 --> libasan5
# Ubuntu 22 --> libasan6
libasan? \
# libasan? \
libgssapi-krb5-2 \
# Ubuntu 18/20 --> libldap-2.4-2
# Ubuntu 22 --> libldap-2.5-0
......
......@@ -98,7 +98,7 @@ RUN rm -f /etc/rhsm-host && \
microdnf update -y && \
microdnf install -y \
tzdata \
libasan \
# libasan \
lksctp-tools \
procps-ng \
psmisc \
......
......@@ -88,7 +88,7 @@ RUN apt-get update && \
# Ubuntu 18 --> libasan4
# Ubuntu 20 --> libasan5
# Ubuntu 22 --> libasan6
libasan? \
# libasan? \
libgssapi-krb5-2 \
# Ubuntu 18/20 --> libldap-2.4-2
# Ubuntu 22 --> libldap-2.5-0
......
......@@ -122,7 +122,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")
......
......@@ -103,12 +103,8 @@ int main(int argc, char** argv) {
Logger::init("AMF", Options::getlogStdout(), Options::getlogRotFilelog());
Logger::amf_app().startup("Options parsed!");
// TODO: to be optimized
struct sigaction sigIntHandler;
sigIntHandler.sa_handler = amf_signal_handler;
sigemptyset(&sigIntHandler.sa_mask);
sigIntHandler.sa_flags = 0;
sigaction(SIGINT, &sigIntHandler, NULL);
std::signal(SIGTERM, amf_signal_handler);
std::signal(SIGINT, amf_signal_handler);
amf_cfg.load(Options::getlibconfigConfig());
amf_cfg.display();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment