]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 237699 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 5 Jan 2010 17:19:47 +0000 (17:19 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 5 Jan 2010 17:19:47 +0000 (17:19 +0000)
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

main/utils.c

index 9c92af6d7a372773a10b5afb9a8f49b09b5a368f..a59aea67006ec8298f17c1fd8d25e415e0e0d2b1 100644 (file)
@@ -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 */