[netstack] don't log to syslog
The kernel log is also sent to syslog, so we should avoid double duty.
Change-Id: I862de5b434e2fb5f31593ffbffa8578979521069
diff --git a/garnet/public/lib/syslog/go/src/syslog/logger.go b/garnet/public/lib/syslog/go/src/syslog/logger.go
index fb1eb3f..aaed5aa 100644
--- a/garnet/public/lib/syslog/go/src/syslog/logger.go
+++ b/garnet/public/lib/syslog/go/src/syslog/logger.go
@@ -120,8 +120,6 @@
type LogInitOptions struct {
LogLevel LogLevel
- LogToSocket uint32
- LogToWriter uint32
MinSeverityForFileAndLineInfo LogLevel
Socket zx.Socket
Tags []string
@@ -156,8 +154,6 @@
}
return NewLogger(LogInitOptions{
LogLevel: InfoLevel,
- LogToSocket: 1,
- LogToWriter: 0,
MinSeverityForFileAndLineInfo: ErrorLevel,
Socket: s,
Tags: tags,
@@ -294,13 +290,12 @@
if logLevel == FatalLevel {
defer os.Exit(1)
}
- if atomic.LoadUint32(&l.options.LogToSocket) != 0 {
+ if atomic.LoadUint32((*uint32)(&l.options.Socket)) != uint32(zx.HandleInvalid) {
switch err := l.logToSocket(time, logLevel, tag, msg).(type) {
- case nil:
case *zx.Error:
switch err.Status {
case zx.ErrPeerClosed, zx.ErrBadState:
- atomic.StoreUint32(&l.options.LogToWriter, 1)
+ atomic.StoreUint32((*uint32)(&l.options.Socket), uint32(zx.HandleInvalid))
default:
return err
}
@@ -308,10 +303,7 @@
return err
}
}
- if atomic.LoadUint32(&l.options.LogToWriter) != 0 {
- return l.logToWriter(l.options.Writer, time, logLevel, tag, msg)
- }
- return nil
+ return l.logToWriter(l.options.Writer, time, logLevel, tag, msg)
}
func (l *Logger) SetSeverity(logLevel LogLevel) {
diff --git a/garnet/public/lib/syslog/go/src/syslog/logger_test.go b/garnet/public/lib/syslog/go/src/syslog/logger_test.go
index db0b49c7b..712aa99 100644
--- a/garnet/public/lib/syslog/go/src/syslog/logger_test.go
+++ b/garnet/public/lib/syslog/go/src/syslog/logger_test.go
@@ -29,44 +29,37 @@
}
defer os.Remove(tmpFile.Name())
for _, logToSocket := range []bool{false, true} {
- for _, logToWriter := range []bool{false, true} {
- options :=
- syslog.LogInitOptions{
- MinSeverityForFileAndLineInfo: syslog.ErrorLevel,
- Socket: sout,
- Writer: tmpFile,
- }
- if logToSocket {
- options.LogToSocket = 1
+ options :=
+ syslog.LogInitOptions{
+ MinSeverityForFileAndLineInfo: syslog.ErrorLevel,
+ Writer: tmpFile,
}
- if logToWriter {
- options.LogToWriter = 1
- }
- logger, err := syslog.NewLogger(options)
+ if logToSocket {
+ options.Socket = sout
+ }
+ logger, err := syslog.NewLogger(options)
+ if err != nil {
+ t.Fatal(err)
+ }
+ const format = "integer: %d"
+ logger.Infof(format, 10)
+ if logToSocket {
+ expectedMsg := fmt.Sprintf(format, 10)
+ checkoutput(t, sin, expectedMsg, syslog.InfoLevel)
+ } else {
+ tmpFile.Sync()
+ tmpFile.Seek(0, 0)
+ expected := "INFO: integer: 10\n"
+ b, err := ioutil.ReadAll(tmpFile)
if err != nil {
t.Fatal(err)
}
- const format = "integer: %d"
- logger.Infof(format, 10)
- if logToSocket {
- expectedMsg := fmt.Sprintf(format, 10)
- checkoutput(t, sin, expectedMsg, syslog.InfoLevel)
+ got := string(b)
+ if !strings.HasSuffix(got, expected) {
+ t.Errorf("%q should have ended in %q", got, expected)
}
- if logToWriter {
- tmpFile.Sync()
- tmpFile.Seek(0, 0)
- expected := "INFO: integer: 10\n"
- b, err := ioutil.ReadAll(tmpFile)
- if err != nil {
- t.Fatal(err)
- }
- got := string(b)
- if !strings.HasSuffix(got, expected) {
- t.Errorf("%q should have ended in %q", got, expected)
- }
- if !strings.Contains(got, fmt.Sprintf("[%d]", pid)) {
- t.Errorf("%q should contains %d", got, pid)
- }
+ if !strings.Contains(got, fmt.Sprintf("[%d]", pid)) {
+ t.Errorf("%q should contains %d", got, pid)
}
tmpFile.Truncate(0)
}
@@ -78,7 +71,6 @@
t.Fatal(err)
}
log, err := syslog.NewLogger(syslog.LogInitOptions{
- LogToSocket: 1,
MinSeverityForFileAndLineInfo: syslog.ErrorLevel,
Socket: sout,
Tags: tags,
diff --git a/src/connectivity/network/netstack/main.go b/src/connectivity/network/netstack/main.go
index 8ca84ce..32760b0 100644
--- a/src/connectivity/network/netstack/main.go
+++ b/src/connectivity/network/netstack/main.go
@@ -45,17 +45,10 @@
ctx := context.CreateFromStartupInfo()
- s, err := syslog.ConnectToLogger(ctx.Connector())
- if err != nil {
- panic(err)
- }
l, err := syslog.NewLogger(syslog.LogInitOptions{
LogLevel: syslog.DebugLevel,
- LogToSocket: 1,
- LogToWriter: 1,
MinSeverityForFileAndLineInfo: syslog.InfoLevel,
- Socket: s,
- Tags: []string{"netstack"},
+ Tags: []string{"netstack"},
})
if err != nil {
panic(err)
