Merge pull request apache#41 from wanhailong/master

Add time parser for 3tee service

Author: wangtuanjie

go/src/pili.qiniu.com/dsync.v1/parse.go

@@ -29,6 +29,7 @@ var (
 	StrNgxErr   = "NGXERR"
 	StrNgxProxy = "NGXPROXY"
 	StrOvs      = "OVS"
+	Str3TEE     = "3TEE"
 
 	StrTx0    = "TX0"
 	StrTx1    = "TX1"
@@ -62,6 +63,8 @@ func ParseTime(line []byte, typ string) (ts int64, err error) {
 		t, err = parsePili(line)
 	case StrOvs:
 		t, err = parseOVS(line)
+	case Str3TEE:
+		t, err = parseTime3tee(line)
 	default:
 		panic(typ)
 	}
@@ -90,6 +93,18 @@ func parseLocal(layout, dest string) (time.Time, error) {
 	return t, err
 }
 
+// (3tee)
+// 2014/04/16 14:54:01
+const TimeFmt3tee = "2006-01-02 15:04:05"
+
+func parseTime3tee(line []byte) (t time.Time, err error) {
+	if len(line) < len(TimeFmt3tee) {
+		err = ErrLineTooShortToParseTime
+		return
+	}
+	return parseLocal(TimeFmt3tee, string(line[0:len(TimeFmt3tee)]))
+}
+
 // (app|ngx.err)
 // 2014/04/16 14:54:01
 const TimeFmtAppNgxErr = "2006/01/02 15:04:05"

go/src/pili.qiniu.com/dsync.v1/parse_test.go

@@ -107,6 +107,11 @@ func TestParseTime(t *testing.T) {
 			StrApp,
 			1444432800000000000,
 		},
+		{
+			`2015-10-10 07:20:00.09s [:0000001f  DEBUG http req: /rtc/room/create]`,
+			Str3TEE,
+			1444432800000000000,
+		},
 		{
 			`106.38.216.15 - - [10/Oct/2015:09:50:00 +0800] "GET /feedimage/21/14/21140F47-50DF-9F13-585B-42827E2F55F120151006_S.webp HTTP/1.1" 200 4095 3612 "-" "MomoChat/6.4 Android/436 (HUAWEI MT7-CL00; Android 4.4.2; Gapps 1; zh_CN; 11)" "111.40.196.86" 10.30.22.39:5000 momo-img.qiniucdn.com 7VYAAAZa_AMqsAsU 0.005 0.005 chinanetcenter`,
 			StrNgxAcc,