From: Russell Bryant Date: Tue, 5 Jan 2010 17:19:47 +0000 (+0000) Subject: Merged revisions 237699 via svnmerge from X-Git-Tag: 1.6.0.21-rc1~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6983477cd7725f857aa0cb7d668facc23425cc73;p=thirdparty%2Fasterisk.git Merged revisions 237699 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r237699 | russell | 2010-01-05 11:16:01 -0600 (Tue, 05 Jan 2010) | 14 lines Merged revisions 237697 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r237697 | russell | 2010-01-05 11:13:28 -0600 (Tue, 05 Jan 2010) | 7 lines Change a NOTICE log message to DEBUG where it belongs. (closes issue #16479) Reported by: alexrecarey (closes SWP-577) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237712 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/utils.c b/main/utils.c index 9c92af6d7a..a59aea6700 100644 --- a/main/utils.c +++ b/main/utils.c @@ -964,7 +964,9 @@ static int ast_wait_for_output(int fd, int timeoutms) while ((res = ast_poll(&pfd, 1, timeoutms - elapsed)) <= 0) { if (res == 0) { /* timed out. */ - ast_log(LOG_NOTICE, "Timed out trying to write\n"); +#ifndef STANDALONE + ast_debug(1, "Timed out trying to write\n"); +#endif return -1; } else if (res == -1) { /* poll() returned an error, check to see if it was fatal */