diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-15 10:23:19 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-15 10:23:19 +0200 |
commit | 72c235744023d10e1a9b44c90b65a6b34029e471 (patch) | |
tree | d6e14606cc430beeead93d68fc46de7ed82915c1 /plugins/sm_cust_bindcdr | |
parent | 9105946272e4190e042981f35994b3f044ebb0d3 (diff) | |
parent | 254dc643c260c0f4a489188b2277811a4104063e (diff) | |
download | rsyslog-72c235744023d10e1a9b44c90b65a6b34029e471.tar.gz rsyslog-72c235744023d10e1a9b44c90b65a6b34029e471.tar.xz rsyslog-72c235744023d10e1a9b44c90b65a6b34029e471.zip |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'plugins/sm_cust_bindcdr')
-rw-r--r-- | plugins/sm_cust_bindcdr/sm_cust_bindcdr.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/plugins/sm_cust_bindcdr/sm_cust_bindcdr.c b/plugins/sm_cust_bindcdr/sm_cust_bindcdr.c index 3fe96ac4..baad667e 100644 --- a/plugins/sm_cust_bindcdr/sm_cust_bindcdr.c +++ b/plugins/sm_cust_bindcdr/sm_cust_bindcdr.c @@ -122,7 +122,8 @@ finalize_it: * An actual message sample for what we intend to parse is (one line): <30>Mar 24 13:01:51 named[6085]: 24-Mar-2011 13:01:51.865 queries: info: client 10.0.0.96#39762: view trusted: query: 8.6.0.9.9.4.1.4.6.1.8.3.mobilecrawler.com IN TXT + (10.0.0.96) */ -#define SQL_STMT "INSERT INTO CDR(`Date`,`Time`, timeMS, client, view, query, ip) VALUES ('" +//previos dev: #define SQL_STMT "INSERT INTO CDR(`Date`,`Time`, timeMS, client, view, query, ip) VALUES ('" +#define SQL_STMT "INSERT INTO CDR(`date`,ip,user,dest) VALUES ('" #define ADD_SQL_DELIM \ memcpy(*ppBuf + iBuf, "', '", sizeof("', '") - 1); \ iBuf += sizeof("', '") - 1; @@ -316,16 +317,21 @@ CODESTARTstrgen memcpy(*ppBuf + iBuf, szDate, lenDate); iBuf += lenDate; - ADD_SQL_DELIM + /* prviously: ADD_SQL_DELIM */ + *(*ppBuf + iBuf) = ' '; + ++iBuf; memcpy(*ppBuf + iBuf, szTime, lenTime); iBuf += lenTime; ADD_SQL_DELIM + /* we shall now discard this part memcpy(*ppBuf + iBuf, szMSec, lenMSec); iBuf += lenMSec; ADD_SQL_DELIM + */ + /* Note that this seem to be the IP to use */ memcpy(*ppBuf + iBuf, szClient, lenClient); iBuf += lenClient; ADD_SQL_DELIM @@ -336,10 +342,12 @@ CODESTARTstrgen memcpy(*ppBuf + iBuf, szQuery, lenQuery); iBuf += lenQuery; - ADD_SQL_DELIM + /* this is now the last field, so we dont need: ADD_SQL_DELIM */ + /* no longer to be included memcpy(*ppBuf + iBuf, szIP, lenIP); iBuf += lenIP; + */ /* end of SQL statement/trailer (NUL is contained in string!) */ memcpy(*ppBuf + iBuf, SQL_STMT_END, sizeof(SQL_STMT_END)); |