Merge pull request #4348 from smothiki/logger

Sivaram Mothiki · Sivaram Mothiki · commit ea94180c7fff · 2015-08-27T14:03:42.000-06:00
fix(logger): add unique id for each app name in logs
diff --git a/logspout/logspout.go b/logspout/logspout.go
@@ -102,7 +102,7 @@ func getLogName(name string) (string, string) {
 	if match != nil {
 		return match[1], match[3]
 	}
-	match = getMatch(`^k8s_([a-z0-9-]+)-([a-z]+)\.`, name)
+	match = getMatch(`^k8s_([a-z0-9-]+)-[a-z]+\.[\da-f]+_[a-z0-9-]+-([a-z]+-[\da-z]*)_`, name)
 	if match != nil {
 		return match[1], match[2]
 	}

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ func getLogName(name string) (string, string) {`
`102`	`102`	`if match != nil {`
`103`	`103`	`return match[1], match[3]`
`104`	`104`	`}`
`105`		- match = getMatch(`^k8s_([a-z0-9-]+)-([a-z]+)\.`, name)
	`105`	+ match = getMatch(`^k8s_([a-z0-9-]+)-[a-z]+\.[\da-f]+_[a-z0-9-]+-([a-z]+-[\da-z]*)_`, name)
`106`	`106`	`if match != nil {`
`107`	`107`	`return match[1], match[2]`
`108`	`108`	`}`