Commit a41666ec 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-smf!164
parents d21a0c1b 1bcafc95
...@@ -65,7 +65,7 @@ RUN apt-get update && \ ...@@ -65,7 +65,7 @@ RUN apt-get update && \
# Ubuntu 18 --> libasan4 # Ubuntu 18 --> libasan4
# Ubuntu 20 --> libasan5 # Ubuntu 20 --> libasan5
# Ubuntu 22 --> libasan6 # Ubuntu 22 --> libasan6
libasan? \ # libasan? \
libgssapi-krb5-2 \ libgssapi-krb5-2 \
# Ubuntu 18/20 --> libldap-2.4-2 # Ubuntu 18/20 --> libldap-2.4-2
# Ubuntu 22 --> libldap-2.5-0 # Ubuntu 22 --> libldap-2.5-0
......
...@@ -97,7 +97,7 @@ RUN rm -f /etc/rhsm-host && \ ...@@ -97,7 +97,7 @@ RUN rm -f /etc/rhsm-host && \
microdnf update -y && \ microdnf update -y && \
microdnf install -y \ microdnf install -y \
tzdata \ tzdata \
libasan \ # libasan \
procps-ng \ procps-ng \
psmisc \ psmisc \
net-tools \ net-tools \
......
...@@ -87,7 +87,7 @@ RUN apt-get update && \ ...@@ -87,7 +87,7 @@ RUN apt-get update && \
# Ubuntu 18 --> libasan4 # Ubuntu 18 --> libasan4
# Ubuntu 20 --> libasan5 # Ubuntu 20 --> libasan5
# Ubuntu 22 --> libasan6 # Ubuntu 22 --> libasan6
libasan? \ # libasan? \
libgssapi-krb5-2 \ libgssapi-krb5-2 \
# Ubuntu 18/20 --> libldap-2.4-2 # Ubuntu 18/20 --> libldap-2.4-2
# Ubuntu 22 --> libldap-2.5-0 # Ubuntu 22 --> libldap-2.5-0
......
...@@ -125,7 +125,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") ...@@ -125,7 +125,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
SET(ASAN asan) SET(ASAN asan)
endif() endif()
if (CMAKE_BUILD_TYPE STREQUAL "Release") if (CMAKE_BUILD_TYPE STREQUAL "Release")
SET(ASAN asan) Message("no more asan in Release Mode")
endif() endif()
if (CMAKE_BUILD_TYPE STREQUAL "Debug") if (CMAKE_BUILD_TYPE STREQUAL "Debug")
add_boolean_option(LOG_OAI True "Thread safe logging API") add_boolean_option(LOG_OAI True "Thread safe logging API")
......
...@@ -104,11 +104,8 @@ int main(int argc, char** argv) { ...@@ -104,11 +104,8 @@ int main(int argc, char** argv) {
Logger::init("smf", Options::getlogStdout(), Options::getlogRotFilelog()); Logger::init("smf", Options::getlogStdout(), Options::getlogRotFilelog());
Logger::smf_app().startup("Options parsed"); Logger::smf_app().startup("Options parsed");
struct sigaction sigIntHandler; std::signal(SIGTERM, my_app_signal_handler);
sigIntHandler.sa_handler = my_app_signal_handler; std::signal(SIGINT, my_app_signal_handler);
sigemptyset(&sigIntHandler.sa_mask);
sigIntHandler.sa_flags = 0;
sigaction(SIGINT, &sigIntHandler, NULL);
// Config // Config
smf_cfg.load(Options::getlibconfigConfig()); smf_cfg.load(Options::getlibconfigConfig());
......
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