diff --git a/embed/config_logging_journald_unix.go b/embed/config_logging_journal_unix.go similarity index 88% rename from embed/config_logging_journald_unix.go rename to embed/config_logging_journal_unix.go index 8e5e2369f..ff9ddd055 100644 --- a/embed/config_logging_journald_unix.go +++ b/embed/config_logging_journal_unix.go @@ -27,9 +27,9 @@ import ( // use stderr as fallback func getJournalWriteSyncer() (zapcore.WriteSyncer, error) { - jw, err := logutil.NewJournaldWriter(os.Stderr) + jw, err := logutil.NewJournalWriter(os.Stderr) if err != nil { - return nil, fmt.Errorf("can't find journald (%v)", err) + return nil, fmt.Errorf("can't find journal (%v)", err) } return zapcore.AddSync(jw), nil } diff --git a/embed/config_logging_journald_windows.go b/embed/config_logging_journal_windows.go similarity index 100% rename from embed/config_logging_journald_windows.go rename to embed/config_logging_journal_windows.go diff --git a/pkg/logutil/zap_journald.go b/pkg/logutil/zap_journal.go similarity index 89% rename from pkg/logutil/zap_journald.go rename to pkg/logutil/zap_journal.go index a157bebab..b1788bc83 100644 --- a/pkg/logutil/zap_journald.go +++ b/pkg/logutil/zap_journal.go @@ -30,16 +30,16 @@ import ( "go.uber.org/zap/zapcore" ) -// NewJournaldWriter wraps "io.Writer" to redirect log output +// NewJournalWriter wraps "io.Writer" to redirect log output // to the local systemd journal. If journald send fails, it fails // back to writing to the original writer. // The decode overhead is only <30µs per write. // Reference: https://github.com/coreos/pkg/blob/master/capnslog/journald_formatter.go -func NewJournaldWriter(wr io.Writer) (io.Writer, error) { - return &journaldWriter{Writer: wr}, systemd.DialJournal() +func NewJournalWriter(wr io.Writer) (io.Writer, error) { + return &journalWriter{Writer: wr}, systemd.DialJournal() } -type journaldWriter struct { +type journalWriter struct { io.Writer } @@ -50,7 +50,7 @@ type logLine struct { Caller string `json:"caller"` } -func (w *journaldWriter) Write(p []byte) (int, error) { +func (w *journalWriter) Write(p []byte) (int, error) { line := &logLine{} if err := json.NewDecoder(bytes.NewReader(p)).Decode(line); err != nil { return 0, err diff --git a/pkg/logutil/zap_journald_test.go b/pkg/logutil/zap_journal_test.go similarity index 90% rename from pkg/logutil/zap_journald_test.go rename to pkg/logutil/zap_journal_test.go index ddcb459eb..29107a5fd 100644 --- a/pkg/logutil/zap_journald_test.go +++ b/pkg/logutil/zap_journal_test.go @@ -24,9 +24,9 @@ import ( "go.uber.org/zap/zapcore" ) -func TestNewJournaldWriter(t *testing.T) { +func TestNewJournalWriter(t *testing.T) { buf := bytes.NewBuffer(nil) - jw, err := NewJournaldWriter(buf) + jw, err := NewJournalWriter(buf) if err != nil { t.Skip(err) } @@ -42,7 +42,7 @@ func TestNewJournaldWriter(t *testing.T) { lg := zap.New(cr, zap.AddCaller(), zap.ErrorOutput(syncer)) defer lg.Sync() - lg.Info("TestNewJournaldWriter") + lg.Info("TestNewJournalWriter") if buf.String() == "" { // check with "journalctl -f" t.Log("sent logs successfully to journald")