diff options
author | Richard Mudgett <rmudgett@digium.com> | 2012-01-13 17:36:44 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2012-01-13 17:36:44 +0000 |
commit | 523c95e1463553e8d9817a6ea2c2024384247149 (patch) | |
tree | 05ffcc9e6c9327f0f182ce78e9e0aa383afd27c7 /cel/cel_manager.c | |
parent | 9c4821f4683232103e9882a73cbe48da52ede002 (diff) |
Add missing CEL logging fields to various CEL backends.
Multiple revisions 350555,350571
........
r350555 | rmudgett | 2012-01-13 11:12:51 -0600 (Fri, 13 Jan 2012) | 12 lines
Add missing CEL logging fields to various CEL backends.
* Add missing eventextra to cel_psql.c and cel_odbc.c.
* Add missing PeerAccount and EventExtra to cel_manager.c.
* Add missing userdeftype support for cel_custom.conf.sample and
cel_sqlite3_custom.conf.sample.
(closes issue ASTERISK-17190)
Reported by: Bryant Zimmerman
........
r350571 | rmudgett | 2012-01-13 11:23:57 -0600 (Fri, 13 Jan 2012) | 8 lines
Use compatible names for event extra data for various CEL backends.
* Change eventextra to extra in cel_psql.c and cel_odbc.c.
* Change EventExtra to Extra in cel_manager.c.
(issue ASTERISK-17190)
........
Merged revisions 350555,350571 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 350585 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@350605 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'cel/cel_manager.c')
-rw-r--r-- | cel/cel_manager.c | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/cel/cel_manager.c b/cel/cel_manager.c index 551b861d0..76ca48bbb 100644 --- a/cel/cel_manager.c +++ b/cel/cel_manager.c @@ -61,11 +61,11 @@ static void manager_log(const struct ast_event *event, void *userdata) .version = AST_CEL_EVENT_RECORD_VERSION, }; - if (ast_cel_fill_record(event, &record)) { + if (!enablecel) { return; } - if (!enablecel) { + if (ast_cel_fill_record(event, &record)) { return; } @@ -90,13 +90,29 @@ static void manager_log(const struct ast_event *event, void *userdata) "UniqueID: %s\r\n" "LinkedID: %s\r\n" "Userfield: %s\r\n" - "Peer: %s\r\n", - record.event_name, record.account_code, record.caller_id_num, - record.caller_id_name, record.caller_id_ani, record.caller_id_rdnis, - record.caller_id_dnid, record.extension, record.context, record.channel_name, - record.application_name, record.application_data, start_time, - ast_cel_get_ama_flag_name(record.amaflag), record.unique_id, record.linked_id, - record.user_field, record.peer); + "Peer: %s\r\n" + "PeerAccount: %s\r\n" + "Extra: %s\r\n", + record.event_name, + record.account_code, + record.caller_id_num, + record.caller_id_name, + record.caller_id_ani, + record.caller_id_rdnis, + record.caller_id_dnid, + record.extension, + record.context, + record.channel_name, + record.application_name, + record.application_data, + start_time, + ast_cel_get_ama_flag_name(record.amaflag), + record.unique_id, + record.linked_id, + record.user_field, + record.peer, + record.peer_account, + record.extra); } static int load_config(int reload) |