Merge remote branch 'origin/topic/jsiwek/log-escaping'

* origin/topic/jsiwek/log-escaping:
  Add missing ascii writer options to log header.
  Escape the ASCII log's set separator (addresses #712)
  Rewrite ODesc character escaping functionality. (addresses #681)

Closes #712.
This commit is contained in:
Robin Sommer 2011-12-18 16:42:58 -08:00
parent 0a3e160a8d
commit 3220bbce55
72 changed files with 487 additions and 168 deletions

View file

@ -1,5 +1,8 @@
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path test.failure
#fields t id.orig_h id.orig_p id.resp_h id.resp_p status country
#types time addr port addr port string string
1315167053.923545 1.2.3.4 1234 2.3.4.5 80 failure US
1323275882.725518 1.2.3.4 1234 2.3.4.5 80 failure US

View file

@ -1,5 +1,8 @@
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path test.success
#fields t id.orig_h id.orig_p id.resp_h id.resp_p status country
#types time addr port addr port string string
1315167053.923545 1.2.3.4 1234 2.3.4.5 80 success -
1323275882.725518 1.2.3.4 1234 2.3.4.5 80 success -