Merge pull request #2001 from bacongobbler/logger-fix

fix(logger) small logger fixes

Author: Matthew Fisher

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):

logger/syslogd/syslogd.go

@@ -1,15 +1,16 @@
 package main
 
 import (
-	"errors"
 	"fmt"
-	"github.com/deis/deis/logger/syslog"
 	"io"
+	"log"
 	"os"
 	"os/signal"
 	"path"
 	"regexp"
 	"syscall"
+
+	"github.com/deis/deis/logger/syslog"
 )
 
 const logRoot = "/var/log/deis"
@@ -45,10 +46,10 @@ 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, errors.New("Could not find app name in message")
+		return nil, fmt.Errorf("Could not find app name in message: %s", m)
 	}
 	appName := match[1]
 	filePath := path.Join(logRoot, appName+".log")
@@ -84,13 +85,11 @@ func (h *handler) mainLoop() {
 		if m == nil {
 			break
 		}
-		fmt.Println(m)
 		err := writeToDisk(m)
 		if err != nil {
-			panic(err)
+			log.Println(err)
 		}
 	}
-	fmt.Println("Exit handler")
 	h.End()
 }
 
@@ -106,7 +105,6 @@ func main() {
 	<-sc
 
 	// Shutdown the server
-	fmt.Println("Shutdown the server...")
+	fmt.Println("Shutting down...")
 	s.Shutdown()
-	fmt.Println("Server is down")
 }