From 49e7d14699b299dffa835b2a9240e2f03e8d0dd3 Mon Sep 17 00:00:00 2001
From: Shulhan <ms@kilabit.info>
Date: Fri, 4 Jan 2019 07:55:43 +0700
Subject: config: change the capture request header separator to comma

This is to make it consistent with separator on "accept_backend".
---
 cmd/haminer/haminer.conf | 4 ++--
 config.go                | 6 +++---
 config_test.go           | 2 +-
 testdata/haminer.conf    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cmd/haminer/haminer.conf b/cmd/haminer/haminer.conf
index 8bdec74..428e354 100644
--- a/cmd/haminer/haminer.conf
+++ b/cmd/haminer/haminer.conf
@@ -30,13 +30,13 @@
 ## Parse HTTP request header in log file generated by "capture request header
 ## ..." option.
 ##
-## Format: [ name ] *["|" name]
+## Format: [ name ] *["," name]
 ##   The name should contains only alphabets and underscore.
 ## Default: "" (empty)
 ##
 ## Examples,
 ##
-##   capture_request_header = host | referrer
+##   capture_request_header = host , referrer
 ##
 
 #capture_request_header=
diff --git a/config.go b/config.go
index 95b1a44..3161c1f 100644
--- a/config.go
+++ b/config.go
@@ -131,8 +131,8 @@ func (cfg *Config) ParseAcceptBackend(v string) {
 }
 
 //
-// ParseCaptureRequestHeader Parse request header names where each name is
-// separated by "|".
+// ParseCaptureRequestHeader parse request header names where each name is
+// separated by ",".
 //
 func (cfg *Config) ParseCaptureRequestHeader(v string) {
 	v = strings.TrimSpace(v)
@@ -140,7 +140,7 @@ func (cfg *Config) ParseCaptureRequestHeader(v string) {
 		return
 	}
 
-	headers := strings.Split(v, "|")
+	headers := strings.Split(v, ",")
 	for x := 0; x < len(headers); x++ {
 		headers[x] = strings.TrimSpace(headers[x])
 		if len(headers[x]) == 0 {
diff --git a/config_test.go b/config_test.go
index 9f595b7..98e5929 100644
--- a/config_test.go
+++ b/config_test.go
@@ -192,7 +192,7 @@ func TestParseCaptureRequestHeader(t *testing.T) {
 		},
 	}, {
 		desc: "With separator at beginning and end",
-		in:   "|a|b|",
+		in:   ",a,b,",
 		exp: &Config{
 			ListenAddr:      defListenAddr,
 			ListenPort:      defListenPort,
diff --git a/testdata/haminer.conf b/testdata/haminer.conf
index 554b04e..a635dcd 100644
--- a/testdata/haminer.conf
+++ b/testdata/haminer.conf
@@ -1,5 +1,5 @@
 [haminer]
 listen         = 0.0.0.0:8080
-accept_backend = a , b,
-capture_request_header = host | referrer|
+accept_backend = ,a , b,
+capture_request_header = , host, referrer,
 influxdb_api_write     = http://127.0.0.1:8086/write
-- 
cgit v1.3