Merge pull request #4330 from krancour/logger-underscores

krancour · krancour · commit 4467aad156f0 · 2015-08-25T17:08:59.000-04:00
fix(logger): allow underscores in container names
diff --git a/logger/syslogd/syslogd.go b/logger/syslogd/syslogd.go
@@ -50,7 +50,7 @@ func fileExists(path string) (bool, error) {
 }
 
 func getLogFile(message string) (io.Writer, error) {
-	r := regexp.MustCompile(`^.* ([-a-z0-9]+)\[[a-z0-9-_\.]+\].*`)
+	r := regexp.MustCompile(`^.* ([-_a-z0-9]+)\[[a-z0-9-_\.]+\].*`)
 	match := r.FindStringSubmatch(message)
 	if match == nil {
 		return nil, fmt.Errorf("Could not find app name in message: %s", message)

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func fileExists(path string) (bool, error) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`func getLogFile(message string) (io.Writer, error) {`
`53`		- r := regexp.MustCompile(`^.* ([-a-z0-9]+)\[[a-z0-9-_\.]+\].*`)
	`53`	+ r := regexp.MustCompile(`^.* ([-_a-z0-9]+)\[[a-z0-9-_\.]+\].*`)
`54`	`54`	`match := r.FindStringSubmatch(message)`
`55`	`55`	`if match == nil {`
`56`	`56`	`return nil, fmt.Errorf("Could not find app name in message: %s", message)`