Skip to content

Commit 6b66b29

Browse files
author
Matthew Fisher
committed
feat(logger): expose logRoot as a flag
1 parent c920151 commit 6b66b29

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

logger/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var (
2828
func init() {
2929
flag.StringVar(&logAddr, "log-addr", "0.0.0.0", "bind address for the logger")
3030
flag.IntVar(&logPort, "log-port", 514, "bind port for the logger")
31+
flag.StringVar(&syslogd.LogRoot, "log-root", "/data/logs", "log path to store logs")
3132
flag.BoolVar(&enablePublish, "publish", false, "enable publishing to service discovery")
3233
flag.StringVar(&publishHost, "publish-host", getopt("HOST", "127.0.0.1"), "service discovery hostname")
3334
flag.IntVar(&publishInterval, "publish-interval", 10, "publish interval in seconds")

logger/syslogd/syslogd.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/deis/deis/logger/drain"
1414
)
1515

16-
const logRoot = "/data/logs"
16+
var LogRoot string
1717

1818
type handler struct {
1919
// To simplify implementation of our handler we embed helper
@@ -51,7 +51,7 @@ func getLogFile(message string) (io.Writer, error) {
5151
return nil, fmt.Errorf("Could not find app name in message: %s", message)
5252
}
5353
appName := match[1]
54-
filePath := path.Join(logRoot, appName+".log")
54+
filePath := path.Join(LogRoot, appName+".log")
5555
// check if file exists
5656
exists, err := fileExists(filePath)
5757
if err != nil {
@@ -99,11 +99,11 @@ func (h *handler) mainLoop() {
9999
// Listen starts a new syslog server which runs until it receives a signal.
100100
func Listen(signalChan chan os.Signal, cleanupDone chan bool, bindAddr string) {
101101
fmt.Println("Starting syslog...")
102-
// If logRoot doesn't exist, create it
102+
// If LogRoot doesn't exist, create it
103103
// equivalent to Python's `if not os.path.exists(filename)`
104-
if _, err := os.Stat(logRoot); os.IsNotExist(err) {
105-
if err = os.MkdirAll(logRoot, 0777); err != nil {
106-
log.Fatalf("unable to create logRoot at %s", logRoot)
104+
if _, err := os.Stat(LogRoot); os.IsNotExist(err) {
105+
if err = os.MkdirAll(LogRoot, 0777); err != nil {
106+
log.Fatalf("unable to create LogRoot at %s: %v", LogRoot, err)
107107
}
108108
}
109109
// Create a server with one handler and run one listen gorutine

0 commit comments

Comments
 (0)