Merge pull request #935 from deis/app-name-regexes

mboersma · mboersma · commit 19a26f19000d · 2014-05-08T11:39:17.000-06:00
fix(logger): allow digits in app name when parsing log file
diff --git a/logger/syslogd/syslogd.go b/logger/syslogd/syslogd.go
@@ -45,7 +45,7 @@ func fileExists(path string) (bool, error) {
 }
 
 func getLogFile(m *syslog.Message) (io.Writer, error) {
-	r := regexp.MustCompile(`^.* ([a-z-]+)\[[a-z0-9\.]+\].*`)
+	r := regexp.MustCompile(`^.* ([-a-z0-9]+)\[[a-z0-9\.]+\].*`)
 	match := r.FindStringSubmatch(m.String())
 	if match == nil {
 		return nil, errors.New("Could not find app name in message")

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func fileExists(path string) (bool, error) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func getLogFile(m *syslog.Message) (io.Writer, error) {`
`48`		- r := regexp.MustCompile(`^.* ([a-z-]+)\[[a-z0-9\.]+\].*`)
	`48`	+ r := regexp.MustCompile(`^.* ([-a-z0-9]+)\[[a-z0-9\.]+\].*`)
`49`	`49`	`match := r.FindStringSubmatch(m.String())`
`50`	`50`	`if match == nil {`
`51`	`51`	`return nil, errors.New("Could not find app name in message")`