kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

ari: Implement 'debug all' and request/response logging

Browse Source 
The 'ari set debug' command has been enhanced to accept 'all' as an
application name.  This allows dumping of all apps even if an app
hasn't registered yet.  To accomplish this, a new global_debug global
variable was added to res/stasis/app.c and new APIs were added to
set and query the value.

'ari set debug' now displays requests and responses as well as events.
This required refactoring the existing debug code.

* The implementation for 'ari set debug' was moved from stasis/cli.{c,h}
  to ari/cli.{c,h}, and stasis/cli.{c,h} were deleted.
* In order to print the body of incoming requests even if a request
  failed, the consumption of the body was moved from the ari stubs
  to ast_ari_callback in res_ari.c and the moustache templates were
  then regenerated.  The body is now passed to ast_ari_invoke and then
  on to the handlers.  This results in code savings since that template
  was inserted multiple times into all the stubs.

An additional change was made to the ao2_str_container implementation
to add partial key searching and a sort function.  The existing cli
code assumed it was already there when it wasn't so the tab completion
was never working.

Change-Id: Ief936f747ce47f1fb14035fbe61152cf766406bf
This commit is contained in:
George Joseph
2017-01-19 08:05:36 -07:00
parent 48178e5918
commit 17f4989d49
28 changed files with 532 additions and 1123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
res/res_stasis.c
View File

@@ -67,7 +67,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "stasis/app.h"
#include "stasis/control.h"
#include "stasis/messaging.h"
#include "stasis/cli.h"
#include "stasis/stasis_bridge.h"
#include "asterisk/core_unreal.h"
#include "asterisk/musiconhold.h"
@@ -178,11 +177,6 @@ static struct ast_json *stasis_start_to_json(struct stasis_message *message,
STASIS_MESSAGE_TYPE_DEFN_LOCAL(start_message_type,
.to_json = stasis_start_to_json);
const char *stasis_app_name(const struct stasis_app *app)
{
return app_name(app);
}
/*! AO2 hash function for \ref app */
static int app_hash(const void *obj, const int flags)
{
@@ -944,7 +938,7 @@ static int send_start_msg_snapshots(struct ast_channel *chan, struct stasis_app
if (app_subscribe_channel(app, chan)) {
ast_log(LOG_ERROR, "Error subscribing app '%s' to channel '%s'\n",
app_name(app), ast_channel_name(chan));
stasis_app_name(app), ast_channel_name(chan));
return -1;
}
@@ -958,7 +952,7 @@ static int send_start_msg_snapshots(struct ast_channel *chan, struct stasis_app
payload->replace_channel = ao2_bump(replace_channel_snapshot);
json_blob = ast_json_pack("{s: s, s: o, s: []}",
"app", app_name(app),
"app", stasis_app_name(app),
"timestamp", ast_json_timeval(ast_tvnow(), NULL),
"args");
if (!json_blob) {
@@ -1028,7 +1022,7 @@ int app_send_end_msg(struct stasis_app *app, struct ast_channel *chan)
return 0;
}
blob = ast_json_pack("{s: s}", "app", app_name(app));
blob = ast_json_pack("{s: s}", "app", stasis_app_name(app));
if (!blob) {
ast_log(LOG_ERROR, "Error packing JSON for StasisEnd message\n");
return -1;
@@ -1474,10 +1468,6 @@ static struct stasis_app *find_app_by_name(const char *app_name)
res = ao2_find(apps_registry, app_name, OBJ_SEARCH_KEY);
}
if (!res) {
ast_log(LOG_WARNING, "Could not find app '%s'\n",
app_name ? : "(null)");
}
return res;
}
@@ -1958,8 +1948,6 @@ static int unload_module(void)
{
stasis_app_unregister_event_sources();
cli_cleanup();
messaging_cleanup();
cleanup();
@@ -2117,11 +2105,6 @@ static int load_module(void)
return AST_MODULE_LOAD_FAILURE;
}
if (cli_init()) {
unload_module();
return AST_MODULE_LOAD_FAILURE;
}
bridge_stasis_init();
stasis_app_register_event_sources();