OpenWrt
/
telephony
mirror of https://git.openwrt.org/feed/telephony.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
telephony/net/freeswitch/patches/370-procd-compat.patch

20 lines
661 B
Diff
Raw Normal View History

freeswitch-stable: procd compatibility procd runs as pid 1. When freeswitch realizes that its parent has pid 1, it thinks that it has been orphaned and terminates the console thread. That's why procd isn't able to get freeswitch's console output. This commit mutes the check in src/switch_console.c. Now console output is properly logged. The workaround parameters "-nc -nf" are replaced by a proper "-c" ("console"). Additionally this commit hands control over killing freeswitch to procd. It's no longer done by the script. This simplifies things quite a bit. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-11-13 04:20:55 +08:00
--- a/src/switch_console.c
+++ b/src/switch_console.c
freeswitch: bump to 1.10.7 - freetdm is now external - added the freeswitch library to InstallDev in preparation for freetdm package - add time64 change which always uses "lld" format and casts - various fixes related to general build and time64 especially - patches refreshed Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2021-10-31 04:08:16 +08:00
@@ -1052,10 +1052,12 @@ static void *SWITCH_THREAD_FUNC console_
freeswitch-stable: procd compatibility procd runs as pid 1. When freeswitch realizes that its parent has pid 1, it thinks that it has been orphaned and terminates the console thread. That's why procd isn't able to get freeswitch's console output. This commit mutes the check in src/switch_console.c. Now console output is properly logged. The workaround parameters "-nc -nf" are replaced by a proper "-c" ("console"). Additionally this commit hands control over killing freeswitch to procd. It's no longer done by the script. This simplifies things quite a bit. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-11-13 04:20:55 +08:00
while (running) {
int32_t arg = 0;
- if (getppid() == 1) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "We've become an orphan, no more console for us.\n");
- break;
- }
+ // Parent PID is 1 when started by procd - so FS is not an orphan.
+ // Plus we still want the output.
+ //if (getppid() == 1) {
+ // switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "We've become an orphan, no more console for us.\n");
+ // break;
+ //}
switch_core_session_ctl(SCSC_CHECK_RUNNING, &arg);
if (!arg) {