[sr-dev] git:master:86532d14: core: main - removed old unchanged compile ifndef condition

Daniel-Constantin Mierla miconda at gmail.com
Wed Dec 2 16:21:53 CET 2020


Module: kamailio
Branch: master
Commit: 86532d14f005409be7ae67e3013703b216775aed
URL: https://github.com/kamailio/kamailio/commit/86532d14f005409be7ae67e3013703b216775aed

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2020-12-02T16:20:57+01:00

core: main - removed old unchanged compile ifndef condition

---

Modified: src/main.c

---

Diff:  https://github.com/kamailio/kamailio/commit/86532d14f005409be7ae67e3013703b216775aed.diff
Patch: https://github.com/kamailio/kamailio/commit/86532d14f005409be7ae67e3013703b216775aed.patch

---

diff --git a/src/main.c b/src/main.c
index db81d3a0c3..fa18b3221e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -797,14 +797,12 @@ void handle_sigs(void)
 				break;
 			}
 
-#ifndef STOP_JIRIS_CHANGES
 			if (dont_fork) {
 				LM_INFO("dont_fork turned on, living on\n");
 				break;
 			}
 			LM_INFO("terminating due to SIGCHLD\n");
-#endif
-			LM_DBG("terminating due to SIGCHLD\n");
+
 			/* exit */
 			shutdown_children(SIGTERM, 1);
 			if (WIFSIGNALED(chld_status)) {
@@ -909,13 +907,9 @@ void sig_usr(int signo)
 #endif
 					break;
 			case SIGCHLD:
-#ifndef 			STOP_JIRIS_CHANGES
 #ifdef SIG_DEBUG /* signal unsafe stuff follows */
 					LM_DBG("SIGCHLD received: "
 						"we do not worry about grand-children\n");
-#endif
-#else
-					_exit(0); /* terminate if one child died */
 #endif
 					break;
 		}




More information about the sr-dev mailing list