2 files changed, 61 insertions, 2 deletions
diff --git a/vendor/github.com/prometheus/common/log/syslog_formatter.go b/vendor/github.com/prometheus/common/log/syslog_formatter.go
index fd8c6fbee..64f5fdac9 100644
--- a/vendor/github.com/prometheus/common/log/syslog_formatter.go
+++ b/vendor/github.com/prometheus/common/log/syslog_formatter.go
@@ -23,6 +23,8 @@ import (
 	"github.com/Sirupsen/logrus"
 )
 
+var _ logrus.Formatter = (*syslogger)(nil)
+
 func init() {
 	setSyslogFormatter = func(appname, local string) error {
 		if appname == "" {
@@ -43,7 +45,7 @@ func init() {
 	}
 }
 
-var ceeTag = []byte("@cee:")
+var prefixTag []byte
 
 type syslogger struct {
 	wrap logrus.Formatter
@@ -56,6 +58,11 @@ func newSyslogger(appname string, facility string, fmter logrus.Formatter) (*sys
 		return nil, err
 	}
 	out, err := syslog.New(priority, appname)
+	_, isJSON := fmter.(*logrus.JSONFormatter)
+	if isJSON {
+		// add cee tag to json formatted syslogs
+		prefixTag = []byte("@cee:")
+	}
 	return &syslogger{
 		out:  out,
 		wrap: fmter,
@@ -92,7 +99,7 @@ func (s *syslogger) Format(e *logrus.Entry) ([]byte, error) {
 	}
 	// only append tag to data sent to syslog (line), not to what
 	// is returned
-	line := string(append(ceeTag, data...))
+	line := string(append(prefixTag, data...))
 
 	switch e.Level {
 	case logrus.PanicLevel:
diff --git a/vendor/github.com/prometheus/common/log/syslog_formatter_test.go b/vendor/github.com/prometheus/common/log/syslog_formatter_test.go
new file mode 100644
index 000000000..b7e68848f
--- /dev/null
+++ b/vendor/github.com/prometheus/common/log/syslog_formatter_test.go
@@ -0,0 +1,52 @@
+// Copyright 2015 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build !windows,!nacl,!plan9
+
+package log
+
+import (
+	"errors"
+	"log/syslog"
+	"testing"
+)
+
+func TestGetFacility(t *testing.T) {
+	testCases := []struct {
+		facility         string
+		expectedPriority syslog.Priority
+		expectedErr      error
+	}{
+		{"0", syslog.LOG_LOCAL0, nil},
+		{"1", syslog.LOG_LOCAL1, nil},
+		{"2", syslog.LOG_LOCAL2, nil},
+		{"3", syslog.LOG_LOCAL3, nil},
+		{"4", syslog.LOG_LOCAL4, nil},
+		{"5", syslog.LOG_LOCAL5, nil},
+		{"6", syslog.LOG_LOCAL6, nil},
+		{"7", syslog.LOG_LOCAL7, nil},
+		{"8", syslog.LOG_LOCAL0, errors.New("invalid local(8) for syslog")},
+	}
+	for _, tc := range testCases {
+		priority, err := getFacility(tc.facility)
+		if err != tc.expectedErr {
+			if err.Error() != tc.expectedErr.Error() {
+				t.Errorf("want %s, got %s", tc.expectedErr.Error(), err.Error())
+			}
+		}
+
+		if priority != tc.expectedPriority {
+			t.Errorf("want %q, got %q", tc.expectedPriority, priority)
+		}
+	}
+}