From: Marc Olivier Chouinard <mochouinard@moctel.com>
Date: Fri, 16 Dec 2011 02:40:02 +0000 (-0500)
Subject: FS-3467 --resolve
X-Git-Tag: v1.2-rc1~27^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de6295b937a65d6a20c5d70d95275f0ce830dbf8;p=thirdparty%2Ffreeswitch.git

FS-3467 --resolve
---

diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index dac0de9a55..03e2cb3faf 100644
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -3491,11 +3491,16 @@ SWITCH_STANDARD_API(originate_function)
 	uint8_t machine = 1;
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 
-	if (session || zstr(cmd)) {
+	if (zstr(cmd)) {
 		stream->write_function(stream, "-USAGE %s\n", ORIGINATE_SYNTAX);
 		return SWITCH_STATUS_SUCCESS;
 	}
 
+	/* log warning if part of ongoing session, as we'll block the session */
+	if (session){
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Originate can take 60 seconds to complete, and blocks the existing session. Do not confuse with a lockup.\n");
+	}
+
 	mycmd = strdup(cmd);
 	switch_assert(mycmd);
 	argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));