From 6ff6536f13f92a13728c0fa9f14cd8a3581a6af4 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 31 May 2006 23:51:39 +0000
Subject: [PATCH] Merged revisions 31194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r31194 | russell | 2006-05-31 19:50:00 -0400 (Wed, 31 May 2006) | 3 lines
if the connection to a FastAGI server fails because of a timeout, log a more
informative log message
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
res/res_agi.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/res/res_agi.c b/res/res_agi.c
index 5fd7da33d8..baae496cbf 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -149,6 +149,7 @@ static enum agi_result launch_netscript(char *agiurl, char *argv[], int *fds, in
struct sockaddr_in sin;
struct hostent *hp;
struct ast_hostent ahp;
+ int res;
/* agiusl is "agi://host.domain[:port][/script/name]" */
host = ast_strdupa(agiurl + 6); /* Remove agi:// */
@@ -200,9 +201,13 @@ static enum agi_result launch_netscript(char *agiurl, char *argv[], int *fds, in
pfds[0].fd = s;
pfds[0].events = POLLOUT;
- while (poll(pfds, 1, MAX_AGI_CONNECT) != 1) {
+ while ((res = poll(pfds, 1, MAX_AGI_CONNECT)) != 1) {
if (errno != EINTR) {
- ast_log(LOG_WARNING, "Connect to '%s' failed: %s\n", agiurl, strerror(errno));
+ if (!res) {
+ ast_log(LOG_WARNING, "FastAGI connection to '%s' timed out after MAX_AGI_CONNECT (%d) milliseconds.\n",
+ agiurl, MAX_AGI_CONNECT);
+ } else
+ ast_log(LOG_WARNING, "Connect to '%s' failed: %s\n", agiurl, strerror(errno));
close(s);
return AGI_RESULT_FAILURE;
}
--
GitLab