[svn-commits] russell: branch 1.6.0 r237712 - in /branches/1.6.0: ./ main/utils.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Jan  5 11:19:47 2010
New Revision: 237712

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=237712
Log:
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)
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/utils.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/utils.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/utils.c?view=diff&rev=237712&r1=237711&r2=237712
==============================================================================
--- branches/1.6.0/main/utils.c (original)
+++ branches/1.6.0/main/utils.c Tue Jan  5 11:19:47 2010
@@ -964,7 +964,9 @@
 	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 */