Bugfix: the header line was ending with a separator.

Test baselines needed adaption as well.
This commit is contained in:
Robin Sommer 2011-03-09 16:55:29 -08:00
parent b69ecff3ee
commit 52c54859b6
18 changed files with 107 additions and 107 deletions

View file

@ -60,11 +60,11 @@ bool LogWriterAscii::DoInit(string path, int num_fields, const LogField* const *
for ( int i = 0; i < num_fields; i++ )
{
const LogField* field = fields[i];
if ( fputs(field->name.c_str(), file) == EOF )
if ( i > 0 && fwrite(separator, separator_len, 1, file) != 1 )
goto write_error;
if ( fwrite(separator, separator_len, 1, file) != 1 )
const LogField* field = fields[i];
if ( fputs(field->name.c_str(), file) == EOF )
goto write_error;
}

View file

@ -1,3 +1,3 @@
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299633982.99326 1.2.3.4 1234 2.3.4.5 80 success unknown
1299633982.99326 1.2.3.4 1234 2.3.4.5 80 failure US
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299718503.40319 1.2.3.4 1234 2.3.4.5 80 success unknown
1299718503.40319 1.2.3.4 1234 2.3.4.5 80 failure US

View file

@ -1,6 +1,6 @@
PREFIX<>t|id.orig_h|id.orig_p|id.resp_h|id.resp_p|status|country|b|
1299718338.37017|1.2.3.4|1234|2.3.4.5|80|success|unknown|NOT-SET
1299718338.37017|1.2.3.4|1234|2.3.4.5|80|NOT-SET|US|NOT-SET
1299718338.37017|1.2.3.4|1234|2.3.4.5|80|failure|UK|NOT-SET
1299718338.37017|1.2.3.4|1234|2.3.4.5|80|NOT-SET|BR|NOT-SET
1299718338.37017|1.2.3.4|1234|2.3.4.5|80|failure|EMPTY|T
PREFIX<>t|id.orig_h|id.orig_p|id.resp_h|id.resp_p|status|country|b
1299718506.56593|1.2.3.4|1234|2.3.4.5|80|success|unknown|NOT-SET
1299718506.56593|1.2.3.4|1234|2.3.4.5|80|NOT-SET|US|NOT-SET
1299718506.56593|1.2.3.4|1234|2.3.4.5|80|failure|UK|NOT-SET
1299718506.56593|1.2.3.4|1234|2.3.4.5|80|NOT-SET|BR|NOT-SET
1299718506.56593|1.2.3.4|1234|2.3.4.5|80|failure|EMPTY|T

View file

@ -1,5 +1,5 @@
1299649281.43936|1.2.3.4|1234|2.3.4.5|80|success|unknown
1299649281.43936|1.2.3.4|1234|2.3.4.5|80|failure|US
1299649281.43936|1.2.3.4|1234|2.3.4.5|80|failure|UK
1299649281.43936|1.2.3.4|1234|2.3.4.5|80|success|BR
1299649281.43936|1.2.3.4|1234|2.3.4.5|80|failure|MX
1299718506.38074|1.2.3.4|1234|2.3.4.5|80|success|unknown
1299718506.38074|1.2.3.4|1234|2.3.4.5|80|failure|US
1299718506.38074|1.2.3.4|1234|2.3.4.5|80|failure|UK
1299718506.38074|1.2.3.4|1234|2.3.4.5|80|success|BR
1299718506.38074|1.2.3.4|1234|2.3.4.5|80|failure|MX

View file

@ -1,2 +1,2 @@
[t=1298326194.80574, id=[orig_h=1.2.3.4, orig_p=1234/tcp, resp_h=2.3.4.5, resp_p=80/tcp], status=success, country=<uninitialized>]
[t=1298326194.80574, id=[orig_h=1.2.3.4, orig_p=1234/tcp, resp_h=2.3.4.5, resp_p=80/tcp], status=failure, country=US]
[t=1299718502.96511, id=[orig_h=1.2.3.4, orig_p=1234/tcp, resp_h=2.3.4.5, resp_p=80/tcp], status=success, country=<uninitialized>]
[t=1299718502.96511, id=[orig_h=1.2.3.4, orig_p=1234/tcp, resp_h=2.3.4.5, resp_p=80/tcp], status=failure, country=US]

View file

@ -1,13 +1,13 @@
static-prefix-0.log
static-prefix-1.log
static-prefix-2.log
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299630368.36038 1.2.3.4 1234 2.3.4.5 80 success unknown
1299630368.36038 1.2.3.4 1234 2.3.4.5 80 success BR
1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure MX3
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure US
1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure MX
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure UK
1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure MX2
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299718503.05867 1.2.3.4 1234 2.3.4.5 80 success unknown
1299718503.05867 1.2.3.4 1234 2.3.4.5 80 success BR
1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure MX3
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure US
1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure MX
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure UK
1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure MX2

View file

@ -1,2 +1,2 @@
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299630368.46042 1.2.3.4 1234 2.3.4.5 80 failure US
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299718503.16177 1.2.3.4 1234 2.3.4.5 80 failure US

View file

@ -1,2 +1,2 @@
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299630368.46042 1.2.3.4 1234 2.3.4.5 80 success -
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299718503.16177 1.2.3.4 1234 2.3.4.5 80 success -

View file

@ -1,4 +1,4 @@
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure US
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure UK
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure MX
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure US
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure UK
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure MX

View file

@ -1,6 +1,6 @@
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 success -
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure US
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure UK
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 success BR
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure MX
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 success -
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure US
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure UK
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 success BR
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure MX

View file

@ -1,3 +1,3 @@
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 success -
1299630368.80723 1.2.3.4 1234 2.3.4.5 80 success BR
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 success -
1299718503.72819 1.2.3.4 1234 2.3.4.5 80 success BR

View file

@ -1,3 +1,3 @@
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure US
1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure UK
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure US
1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure UK

View file

@ -1,4 +1,4 @@
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure US
1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure UK
1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure BR
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure US
1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure UK
1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure BR

View file

@ -29,106 +29,106 @@
1st test-11-03-07_04.00.05.log test.log 11-03-07_04.00.05 11-03-07_04.59.55 1
2nd test2-11-03-07_04.59.55.log test2.log 11-03-07_04.59.55 11-03-07_04.59.55 1
> test-11-03-06_19.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299466805.0 10.0.0.1 20 10.0.0.2 1024
1299470395.0 10.0.0.2 20 10.0.0.3 0
> test-11-03-06_20.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299470405.0 10.0.0.1 20 10.0.0.2 1025
1299473995.0 10.0.0.2 20 10.0.0.3 1
> test-11-03-06_21.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299474005.0 10.0.0.1 20 10.0.0.2 1026
1299477595.0 10.0.0.2 20 10.0.0.3 2
> test-11-03-06_22.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299477605.0 10.0.0.1 20 10.0.0.2 1027
1299481195.0 10.0.0.2 20 10.0.0.3 3
> test-11-03-06_23.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299481205.0 10.0.0.1 20 10.0.0.2 1028
1299484795.0 10.0.0.2 20 10.0.0.3 4
> test-11-03-07_00.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299484805.0 10.0.0.1 20 10.0.0.2 1029
1299488395.0 10.0.0.2 20 10.0.0.3 5
> test-11-03-07_01.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299488405.0 10.0.0.1 20 10.0.0.2 1030
1299491995.0 10.0.0.2 20 10.0.0.3 6
> test-11-03-07_02.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299492005.0 10.0.0.1 20 10.0.0.2 1031
1299495595.0 10.0.0.2 20 10.0.0.3 7
> test-11-03-07_03.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299495605.0 10.0.0.1 20 10.0.0.2 1032
1299499195.0 10.0.0.2 20 10.0.0.3 8
> test-11-03-07_04.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299499205.0 10.0.0.1 20 10.0.0.2 1033
1299502795.0 10.0.0.2 20 10.0.0.3 9
> test.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
> test2-11-03-06_19.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299466805.0 10.0.0.1 20 10.0.0.2 1024
> test2-11-03-06_19.59.55.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299470395.0 10.0.0.2 20 10.0.0.3 0
> test2-11-03-06_20.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299470405.0 10.0.0.1 20 10.0.0.2 1025
> test2-11-03-06_20.59.55.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299473995.0 10.0.0.2 20 10.0.0.3 1
> test2-11-03-06_21.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299474005.0 10.0.0.1 20 10.0.0.2 1026
> test2-11-03-06_21.59.55.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299477595.0 10.0.0.2 20 10.0.0.3 2
> test2-11-03-06_22.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299477605.0 10.0.0.1 20 10.0.0.2 1027
> test2-11-03-06_22.59.55.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299481195.0 10.0.0.2 20 10.0.0.3 3
> test2-11-03-06_23.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299481205.0 10.0.0.1 20 10.0.0.2 1028
> test2-11-03-06_23.59.55.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299484795.0 10.0.0.2 20 10.0.0.3 4
> test2-11-03-07_00.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299484805.0 10.0.0.1 20 10.0.0.2 1029
> test2-11-03-07_00.59.55.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299488395.0 10.0.0.2 20 10.0.0.3 5
> test2-11-03-07_01.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299488405.0 10.0.0.1 20 10.0.0.2 1030
> test2-11-03-07_01.59.55.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299491995.0 10.0.0.2 20 10.0.0.3 6
> test2-11-03-07_02.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299492005.0 10.0.0.1 20 10.0.0.2 1031
> test2-11-03-07_02.59.55.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299495595.0 10.0.0.2 20 10.0.0.3 7
> test2-11-03-07_03.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299495605.0 10.0.0.1 20 10.0.0.2 1032
> test2-11-03-07_03.59.55.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299499195.0 10.0.0.2 20 10.0.0.3 8
> test2-11-03-07_04.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299499205.0 10.0.0.1 20 10.0.0.2 1033
> test2-11-03-07_04.59.55.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299502795.0 10.0.0.2 20 10.0.0.3 9
> test2.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p

View file

@ -9,42 +9,42 @@ test-11-03-07_02.00.05.log test.log 11-03-07_02.00.05 11-03-07_03.00.05 0
test-11-03-07_03.00.05.log test.log 11-03-07_03.00.05 11-03-07_04.00.05 0
test-11-03-07_04.00.05.log test.log 11-03-07_04.00.05 11-03-07_04.59.55 1
> test-11-03-06_19.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299466805.0 10.0.0.1 20 10.0.0.2 1024
1299470395.0 10.0.0.2 20 10.0.0.3 0
> test-11-03-06_20.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299470405.0 10.0.0.1 20 10.0.0.2 1025
1299473995.0 10.0.0.2 20 10.0.0.3 1
> test-11-03-06_21.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299474005.0 10.0.0.1 20 10.0.0.2 1026
1299477595.0 10.0.0.2 20 10.0.0.3 2
> test-11-03-06_22.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299477605.0 10.0.0.1 20 10.0.0.2 1027
1299481195.0 10.0.0.2 20 10.0.0.3 3
> test-11-03-06_23.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299481205.0 10.0.0.1 20 10.0.0.2 1028
1299484795.0 10.0.0.2 20 10.0.0.3 4
> test-11-03-07_00.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299484805.0 10.0.0.1 20 10.0.0.2 1029
1299488395.0 10.0.0.2 20 10.0.0.3 5
> test-11-03-07_01.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299488405.0 10.0.0.1 20 10.0.0.2 1030
1299491995.0 10.0.0.2 20 10.0.0.3 6
> test-11-03-07_02.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299492005.0 10.0.0.1 20 10.0.0.2 1031
1299495595.0 10.0.0.2 20 10.0.0.3 7
> test-11-03-07_03.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299495605.0 10.0.0.1 20 10.0.0.2 1032
1299499195.0 10.0.0.2 20 10.0.0.3 8
> test-11-03-07_04.00.05.log
# t id.orig_h id.orig_p id.resp_h id.resp_p
# t id.orig_h id.orig_p id.resp_h id.resp_p
1299499205.0 10.0.0.1 20 10.0.0.2 1033
1299502795.0 10.0.0.2 20 10.0.0.3 9

View file

@ -1,6 +1,6 @@
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299635864.89679 1.2.3.4 1234 2.3.4.5 80 success unknown
1299635864.89679 1.2.3.4 1234 2.3.4.5 80 failure US
1299635864.89679 1.2.3.4 1234 2.3.4.5 80 failure UK
1299635864.89679 1.2.3.4 1234 2.3.4.5 80 success BR
1299635864.89679 1.2.3.4 1234 2.3.4.5 80 failure MX
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299718506.28824 1.2.3.4 1234 2.3.4.5 80 success unknown
1299718506.28824 1.2.3.4 1234 2.3.4.5 80 failure US
1299718506.28824 1.2.3.4 1234 2.3.4.5 80 failure UK
1299718506.28824 1.2.3.4 1234 2.3.4.5 80 success BR
1299718506.28824 1.2.3.4 1234 2.3.4.5 80 failure MX

View file

@ -1,6 +1,6 @@
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299630368.69723 1.2.3.4 1234 2.3.4.5 80 success unknown
1299630368.69723 1.2.3.4 1234 2.3.4.5 80 failure US
1299630368.69723 1.2.3.4 1234 2.3.4.5 80 failure UK
1299630368.69723 1.2.3.4 1234 2.3.4.5 80 success BR
1299630368.69723 1.2.3.4 1234 2.3.4.5 80 failure MX
# t id.orig_h id.orig_p id.resp_h id.resp_p status country
1299718506.1313 1.2.3.4 1234 2.3.4.5 80 success unknown
1299718506.1313 1.2.3.4 1234 2.3.4.5 80 failure US
1299718506.1313 1.2.3.4 1234 2.3.4.5 80 failure UK
1299718506.1313 1.2.3.4 1234 2.3.4.5 80 success BR
1299718506.1313 1.2.3.4 1234 2.3.4.5 80 failure MX