diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-08-20 20:50:06 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2017-08-27 03:52:47 +0200 |
| commit | 8f4a7c14af338180ecd67cbabaf04fe2e7321596 (patch) | |
| tree | bd3ef86942ac6aeb7e5375a6aecbf3509ca67081 | |
| parent | 5d35245adc2555744600720ad90bb4e3a08605f7 (diff) | |
Treat SIGTERM just like SIGINT in our programs
When somebody kills the process, it's best to handle the signal
and to use the opportunity for some cleanup. We always did this
in the NITB on SIGINT, but never on SIGTERM. Let's change it.
Change-Id: Iea6804325a6575ceab5edfd28dd20249462f143b
| -rw-r--r-- | src/gprs/gb_proxy_main.c | 2 | ||||
| -rw-r--r-- | src/gprs/gtphub_main.c | 2 | ||||
| -rw-r--r-- | src/gprs/sgsn_main.c | 2 | ||||
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_main.c | 2 | ||||
| -rw-r--r-- | src/osmo-msc/msc_main.c | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/src/gprs/gb_proxy_main.c b/src/gprs/gb_proxy_main.c index 69a93b6f7..caff27f6f 100644 --- a/src/gprs/gb_proxy_main.c +++ b/src/gprs/gb_proxy_main.c @@ -98,6 +98,7 @@ static void signal_handler(int signal) switch (signal) { case SIGINT: + case SIGTERM: osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL); sleep(1); exit(0); @@ -232,6 +233,7 @@ int main(int argc, char **argv) msgb_talloc_ctx_init(tall_bsc_ctx, 0); signal(SIGINT, &signal_handler); + signal(SIGTERM, &signal_handler); signal(SIGABRT, &signal_handler); signal(SIGUSR1, &signal_handler); signal(SIGUSR2, &signal_handler); diff --git a/src/gprs/gtphub_main.c b/src/gprs/gtphub_main.c index 73a122c31..2b87d19ef 100644 --- a/src/gprs/gtphub_main.c +++ b/src/gprs/gtphub_main.c @@ -96,6 +96,7 @@ static void signal_handler(int signal) switch (signal) { case SIGINT: + case SIGTERM: osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL); sleep(1); exit(0); @@ -302,6 +303,7 @@ int main(int argc, char **argv) msgb_talloc_ctx_init(osmo_gtphub_ctx, 0); signal(SIGINT, &signal_handler); + signal(SIGTERM, &signal_handler); signal(SIGABRT, &signal_handler); signal(SIGUSR1, &signal_handler); signal(SIGUSR2, &signal_handler); diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index 71cb18c96..d5d43ad2a 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -145,6 +145,7 @@ static void signal_handler(int signal) switch (signal) { case SIGINT: + case SIGTERM: osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL); sleep(1); exit(0); @@ -332,6 +333,7 @@ int main(int argc, char **argv) msgb_talloc_ctx_init(tall_bsc_ctx, 0); signal(SIGINT, &signal_handler); + signal(SIGTERM, &signal_handler); signal(SIGABRT, &signal_handler); signal(SIGUSR1, &signal_handler); signal(SIGUSR2, &signal_handler); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index ee094d670..90651b95e 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -162,6 +162,7 @@ static void signal_handler(int signal) switch (signal) { case SIGINT: + case SIGTERM: bsc_shutdown_net(bsc_gsmnet); osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL); sleep(3); @@ -280,6 +281,7 @@ int main(int argc, char **argv) } signal(SIGINT, &signal_handler); + signal(SIGTERM, &signal_handler); signal(SIGABRT, &signal_handler); signal(SIGUSR1, &signal_handler); signal(SIGUSR2, &signal_handler); diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 6c62db39a..723c0e6e8 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -266,6 +266,7 @@ static void signal_handler(int signal) switch (signal) { case SIGINT: + case SIGTERM: msc_network_shutdown(msc_network); osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL); sleep(3); @@ -472,6 +473,7 @@ TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_i osmo_timer_schedule(&db_sync_timer, DB_SYNC_INTERVAL); signal(SIGINT, &signal_handler); + signal(SIGTERM, &signal_handler); signal(SIGABRT, &signal_handler); signal(SIGUSR1, &signal_handler); signal(SIGUSR2, &signal_handler); |