Merged revisions 81397 via svnmerge from
authorMark Michelson <mmichelson@digium.com>
Thu, 30 Aug 2007 22:08:51 +0000 (22:08 +0000)
committerMark Michelson <mmichelson@digium.com>
Thu, 30 Aug 2007 22:08:51 +0000 (22:08 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81397 | mmichelson | 2007-08-30 17:05:56 -0500 (Thu, 30 Aug 2007) | 7 lines

Removing an extraneous (and possibly misleading) log message. Firstly, if the announce file isn't found, the
streaming functions will report it. Secondly, not all non-zero returns from play_file mean that the announce file
wasn't found. Positive return values simply mean that a digit was pressed (most likely to skip through the announcement).

(closes issue #10612, reported and patched by dimas)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81398 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_queue.c

index c879aed..df21286 100644 (file)
@@ -2658,8 +2658,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
                                        res2 |= ast_safe_sleep(peer, qe->parent->memberdelay * 1000);
                                }
                                if (!res2 && announce) {
-                                       if (play_file(peer, announce))
-                                               ast_log(LOG_WARNING, "Announcement file '%s' is unavailable, continuing anyway...\n", announce);
+                                       play_file(peer, announce);
                                }
                                if (!res2 && qe->parent->reportholdtime) {
                                        if (!play_file(peer, qe->parent->sound_reporthold)) {