innov
/
nightingale
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add log time format 02 / 01 / 2006:15:04:05 (#164) 

* Add log time format 02 / 01 / 2006:15:04:05

* Server Add log time format 02 / 01 / 2006:15:04:05
This commit is contained in:
yanli 2020-06-01 09:53:36 +08:00 committed by GitHub
parent 36a24add6e
commit eaf1d1be6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/collector/stra/log.go
View File

@ -265,6 +265,9 @@ func GetPatAndTimeFormat(tf string) (string, string) {
case "mmdd HH:MM:SS": case "mmdd HH:MM:SS":
pat = `(0[1-9]|1[012])([012][0-9]|3[01])\s([01][0-9]|2[0-4])(:[012345][0-9]){2}` pat = `(0[1-9]|1[012])([012][0-9]|3[01])\s([01][0-9]|2[0-4])(:[012345][0-9]){2}`
timeFormat = "0102 15:04:05" timeFormat = "0102 15:04:05"
case "dd/mm/yyyy:HH:MM:SS":
pat = `([012][0-9]|3[01])/(0[1-9]|1[012])/(2[0-9]{3}):([01][0-9]|2[0-4])(:[012345][0-9]){2}`
timeFormat = "02/01/2006:15:04:05"
default: default:
logger.Errorf("match time pac failed : [timeFormat:%s]", tf) logger.Errorf("match time pac failed : [timeFormat:%s]", tf)
return "", "" return "", ""

3
src/modules/monapi/http/routes/collect.go
View File

@ -508,6 +508,9 @@ func GetPatAndTimeFormat(tf string) (string, string) {
case "mmdd HH:MM:SS": case "mmdd HH:MM:SS":
pat = `(0[1-9]|1[012])([012][0-9]|3[01])\s([01][0-9]|2[0-4])(:[012345][0-9]){2}` pat = `(0[1-9]|1[012])([012][0-9]|3[01])\s([01][0-9]|2[0-4])(:[012345][0-9]){2}`
timeFormat = "0102 15:04:05" timeFormat = "0102 15:04:05"
case "dd/mm/yyyy:HH:MM:SS":
pat = `([012][0-9]|3[01])/(0[1-9]|1[012])/(2[0-9]{3}):([01][0-9]|2[0-4])(:[012345][0-9]){2}`
timeFormat = "02/01/2006:15:04:05"
default: default:
logger.Errorf("match time pac failed : [timeFormat:%s]", tf) logger.Errorf("match time pac failed : [timeFormat:%s]", tf)
return "", "" return "", ""