diff options
| -rw-r--r-- | apps/app_queue.c | 4 | ||||
| -rwxr-xr-x | bootstrap.sh | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | res/res_sorcery_memory_cache.c | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 0abd512fa..9176f9360 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2351,6 +2351,7 @@ static int pending_members_cmp(void *obj, void *arg, int flags) static void pending_members_remove(struct member *mem) { + ast_debug(3, "Removed %s from pending_members\n", mem->membername); ao2_find(pending_members, mem, OBJ_POINTER | OBJ_NODATA | OBJ_UNLINK); } @@ -4207,6 +4208,7 @@ static void do_hang(struct callattempt *o) { o->stillgoing = 0; ast_hangup(o->chan); + pending_members_remove(o->member); o->chan = NULL; } @@ -4287,6 +4289,7 @@ static int can_ring_entry(struct queue_ent *qe, struct callattempt *call) * If not found add it to the container so another queue * won't attempt to call this member at the same time. */ + ast_debug(3, "Add %s to pending_members\n", call->member->membername); ao2_link(pending_members, call->member); ao2_unlock(pending_members); @@ -4422,7 +4425,6 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies /* Again, keep going even if there's an error */ ast_verb(3, "Couldn't call %s\n", tmp->interface); do_hang(tmp); - pending_members_remove(tmp->member); ++*busies; return 0; } diff --git a/bootstrap.sh b/bootstrap.sh index 051ee3e82..272c57b94 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -46,7 +46,7 @@ check_for_app aclocal${MY_AM_VER} echo "Generating the configure script ..." -aclocal${MY_AM_VER} -I autoconf `find third-party/ -maxdepth 1 -type d -printf "-I %p "` +aclocal${MY_AM_VER} -I autoconf `find third-party -maxdepth 1 -type d | xargs -I {} echo -I {}` autoconf${MY_AC_VER} autoheader${MY_AC_VER} automake${MY_AM_VER} --add-missing --copy 2>/dev/null @@ -9296,7 +9296,7 @@ PJPROJECT_BUNDLED=no # Check whether --with-pjproject-bundled was given. if test "${with_pjproject_bundled+set}" = set; then : - withval=$with_pjproject_bundled; case "${enableval}" in + withval=$with_pjproject_bundled; case "${withval}" in n|no) PJPROJECT_BUNDLED=no ;; *) PJPROJECT_BUNDLED=yes ;; esac diff --git a/configure.ac b/configure.ac index 161ccab5f..d604d47a5 100644 --- a/configure.ac +++ b/configure.ac @@ -430,7 +430,7 @@ AH_TEMPLATE(m4_bpatsubst([[HAVE_PJPROJECT_BUNDLED]], [(.*)]), [Define to 1 when AC_ARG_WITH([pjproject-bundled], [AS_HELP_STRING([--with-pjproject-bundled], [Use bundled pjproject libraries])], - [case "${enableval}" in + [case "${withval}" in n|no) PJPROJECT_BUNDLED=no ;; *) PJPROJECT_BUNDLED=yes ;; esac]) diff --git a/res/res_sorcery_memory_cache.c b/res/res_sorcery_memory_cache.c index 4ce4e18e9..7da72bca4 100644 --- a/res/res_sorcery_memory_cache.c +++ b/res/res_sorcery_memory_cache.c @@ -1555,7 +1555,7 @@ static int sorcery_memory_cache_delete(const struct ast_sorcery *sorcery, void * ao2_unlock(cache->objects); if (res) { - ast_log(LOG_ERROR, "Unable to delete object '%s' from sorcery cache\n", ast_sorcery_object_get_id(object)); + ast_debug(1, "Unable to delete object '%s' from sorcery cache\n", ast_sorcery_object_get_id(object)); } return res; |