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)

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

diff --git a/cel/cel_manager.c b/cel/cel_manager.c
index d97bfe9bb553413eb954f05437ce322241207c18..76ca48bbb72b602e9a76ff1bd7acfbbe5d857bea 100644 (file)
--- a/cel/cel_manager.c
+++ b/cel/cel_manager.c
@@ -92,7 +92,7 @@ static void manager_log(const struct ast_event *event, void *userdata)
                "Userfield: %s\r\n"
                "Peer: %s\r\n"
                "PeerAccount: %s\r\n"
-               "EventExtra: %s\r\n",
+               "Extra: %s\r\n",
                record.event_name,
                record.account_code,
                record.caller_id_num,

diff --git a/cel/cel_odbc.c b/cel/cel_odbc.c
index b6ed619f3ebd92bb1f724b20d3a2a091c3d150bc..223cb18c99b3a0dee739d414da3616f301deb5b0 100644 (file)
--- a/cel/cel_odbc.c
+++ b/cel/cel_odbc.c
@@ -438,7 +438,7 @@ static void odbc_log(const struct ast_event *event, void *userdata)
                                        ast_copy_string(colbuf, record.peer, sizeof(colbuf));
                                } else if (strcmp(entry->celname, "amaflags") == 0) {
                                        snprintf(colbuf, sizeof(colbuf), "%d", record.amaflag);
-                               } else if (strcmp(entry->celname, "eventextra") == 0) {
+                               } else if (strcmp(entry->celname, "extra") == 0) {
                                        ast_copy_string(colbuf, record.extra, sizeof(colbuf));
                                } else {
                                        colbuf[0] = 0;

diff --git a/cel/cel_pgsql.c b/cel/cel_pgsql.c
index a6d1d16a918e05327cd17ec33da61b637ffeef27..99374a824e7c46ec2a3e5237a32940a9ca2c9292 100644 (file)
--- a/cel/cel_pgsql.c
+++ b/cel/cel_pgsql.c
@@ -234,7 +234,7 @@ static void pgsql_log(const struct ast_event *event, void *userdata)
                                        value = record.user_field;
                                } else if (strcmp(cur->name, "peer") == 0) {
                                        value = record.peer;
-                               } else if (strcmp(cur->name, "eventextra") == 0) {
+                               } else if (strcmp(cur->name, "extra") == 0) {
                                        value = record.extra;
                                } else {
                                        value = NULL;

diff --git a/configs/cel_odbc.conf.sample b/configs/cel_odbc.conf.sample
index 6e584e5b4f3b46a9dd7e244780440fa569ab4ea2..68d3b0adb25e242098610e0155f507c187b21eff 100644 (file)
--- a/configs/cel_odbc.conf.sample
+++ b/configs/cel_odbc.conf.sample
@@ -47,7 +47,6 @@
 ;        CEL_FORWARD = 25
 ;      eventtime  (timeval, includes microseconds)
 ;      userdeftype (set only if eventtype == USER_DEFINED)
-;      eventextra
 ;      cid_name
 ;      cid_num
 ;      cid_ani
@@ -65,6 +64,7 @@
 ;      amaflags  (an int)
 ;      userfield
 ;      peer
+;      extra
 
 ; The point of this module is to allow you log whatever you like in terms of the
 ; CEL variables.  Do you want to log uniqueid?  Then simply ensure that your

diff --git a/configs/cel_pgsql.conf.sample b/configs/cel_pgsql.conf.sample
index 2d79941bf5ef7312837ff466576fabd909914b03..79ea14475fc33c22701486a9bcc3a8f58c9a0bca 100644 (file)
--- a/configs/cel_pgsql.conf.sample
+++ b/configs/cel_pgsql.conf.sample
@@ -34,7 +34,6 @@
 ;        CEL_FORWARD = 25
 ;      eventtime  (timeval, includes microseconds)
 ;      userdeftype (set only if eventtype == USER_DEFINED)
-;      eventextra
 ;      cid_name
 ;      cid_num
 ;      cid_ani
@@ -52,6 +51,7 @@
 ;      amaflags  (an int)
 ;      userfield
 ;      peer
+;      extra
 
 
 [global]