kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res/res_stasis: Fixed wrong StasisEnd timestamp"

Browse Source
This commit is contained in:
George Joseph
2019-03-19 09:26:47 -05:00
committed by Gerrit Code Review
parent 4a9e30e286 629962d1f7
commit 9ee02bc0c2
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/res_stasis.c
View File

@@ -116,16 +116,23 @@ static struct ast_json *stasis_end_to_json(struct stasis_message *message,
const struct stasis_message_sanitizer *sanitize)
{
struct ast_channel_blob *payload = stasis_message_data(message);
struct ast_json *msg;
if (sanitize && sanitize->channel_snapshot &&
sanitize->channel_snapshot(payload->snapshot)) {
return NULL;
}
return ast_json_pack("{s: s, s: o, s: o}",
msg = ast_json_pack("{s: s, s: O, s: o}",
"type", "StasisEnd",
"timestamp", ast_json_timeval(ast_tvnow(), NULL),
"timestamp", ast_json_object_get(payload->blob, "timestamp"),
"channel", ast_channel_snapshot_to_json(payload->snapshot, sanitize));
if (!msg) {
ast_log(LOG_ERROR, "Failed to pack JSON for StasisEnd message\n");
return NULL;
}
return msg;
}
STASIS_MESSAGE_TYPE_DEFN_LOCAL(end_message_type,
@@ -1063,7 +1070,10 @@ int app_send_end_msg(struct stasis_app *app, struct ast_channel *chan)
return 0;
}
blob = ast_json_pack("{s: s}", "app", stasis_app_name(app));
blob = ast_json_pack("{s: s, s: o}",
"app", stasis_app_name(app),
"timestamp", ast_json_timeval(ast_tvnow(), NULL)
);
if (!blob) {
ast_log(LOG_ERROR, "Error packing JSON for StasisEnd message\n");
return -1;