fix(scheduler): allow proctypes with dashes and underscores

Matthew Fisher · Matthew Fisher · commit ebeab96b2e89 · 2014-10-02T09:25:21.000-07:00
diff --git a/controller/scheduler/coreos.py b/controller/scheduler/coreos.py
@@ -11,7 +11,7 @@
 
 
 MATCH = re.compile(
-    '(?P<app>[a-z0-9-]+)_?(?P<version>v[0-9]+)?\.?(?P<c_type>[a-z]+)?.(?P<c_num>[0-9]+)')
+    '(?P<app>[a-z0-9-]+)_?(?P<version>v[0-9]+)?\.?(?P<c_type>[a-z-_]+)?.(?P<c_num>[0-9]+)')
 
 
 class UHTTPConnection(httplib.HTTPConnection):
diff --git a/logger/syslogd/syslogd.go b/logger/syslogd/syslogd.go
@@ -46,7 +46,7 @@ func fileExists(path string) (bool, error) {
 }
 
 func getLogFile(m *syslog.Message) (io.Writer, error) {
-	r := regexp.MustCompile(`^.* ([-a-z0-9]+)\[[a-z0-9\.]+\].*`)
+	r := regexp.MustCompile(`^.* ([-a-z0-9]+)\[[a-z0-9-_\.]+\].*`)
 	match := r.FindStringSubmatch(m.String())
 	if match == nil {
 		return nil, fmt.Errorf("Could not find app name in message", m.String())

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