[asterisk-commits] russell: branch 1.6.0 r106713 - in /branches/1.6.0: ./ include/asterisk/sched.h

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Mar  7 11:18:31 2008
New Revision: 106713

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106713
Log:
Merged revisions 106707 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r106707 | russell | 2008-03-07 11:17:30 -0600 (Fri, 07 Mar 2008) | 16 lines

Merged revisions 106704 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r106704 | russell | 2008-03-07 11:16:58 -0600 (Fri, 07 Mar 2008) | 8 lines

Change a warning message to a debug message.  This is happening quite frequently,
and it is not worth spamming users with these messages unless we are pretty confident
that it should never happen.  As it stands today, it _will_ and _does_ happen and
until that gets cleaned up a reasonable amount on the development side, let's not
spam the logs of everyone else.

(closes issue #12154)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/sched.h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Fri Mar  7 11:18:31 2008
@@ -1,1 +1,1 @@
-/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,105840-105841,105864,105899,105933,106036,106040,106139,106186,106238-106239,106329,106346,106399,106438-106439,106501,106507,106518,106553,106607,106654,106684
+/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,105840-105841,105864,105899,105933,106036,106040,106139,106186,106238-106239,106329,106346,106399,106438-106439,106501,106507,106518,106553,106607,106654,106684,106707

Modified: branches/1.6.0/include/asterisk/sched.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/sched.h?view=diff&rev=106713&r1=106712&r2=106713
==============================================================================
--- branches/1.6.0/include/asterisk/sched.h (original)
+++ branches/1.6.0/include/asterisk/sched.h Fri Mar  7 11:18:31 2008
@@ -42,7 +42,7 @@
 			usleep(1); \
 		} \
 		if (_count == 10) \
-			ast_log(LOG_WARNING, "Unable to cancel schedule ID %d.  This is probably a bug (%s: %s, line %d).\n", id, __FILE__, __PRETTY_FUNCTION__, __LINE__); \
+			ast_log(LOG_DEBUG, "Unable to cancel schedule ID %d.  This is probably a bug (%s: %s, line %d).\n", id, __FILE__, __PRETTY_FUNCTION__, __LINE__); \
 		id = -1; \
 	} while (0);