Merge pull request #1283 from prometheus/venup

Upgrade common/log vendoring.

vendor/github.com/prometheus/common/log/log.go

@@ -41,23 +41,8 @@ func (f levelFlag) Set(level string) error {
 	return nil
 }
 
-func setSyslogFormatter(appname, local string) error {
+// setSyslogFormatter is nil if the target architecture does not support syslog.
-	if appname == "" {
+var setSyslogFormatter func(string, string) error
-		return fmt.Errorf("missing appname parameter")
-	}
-	if local == "" {
-		return fmt.Errorf("missing local parameter")
-	}
-
-	fmter, err := newSyslogger(appname, local, origLogger.Formatter)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "error creating syslog formatter: %v\n", err)
-		origLogger.Errorf("can't connect logger to syslog: %v", err)
-		return err
-	}
-	origLogger.Formatter = fmter
-	return nil
-}
 
 func setJSONFormatter() {
 	origLogger.Formatter = &logrus.JSONFormatter{}
@@ -87,6 +72,9 @@ func (f logFormatFlag) Set(format string) error {
 
 	switch u.Opaque {
 	case "syslog":
+		if setSyslogFormatter == nil {
+			return fmt.Errorf("system does not support syslog")
+		}
 		appname := u.Query().Get("appname")
 		facility := u.Query().Get("local")
 		return setSyslogFormatter(appname, facility)

vendor/github.com/prometheus/common/log/syslog_formatter.go

@@ -1,3 +1,18 @@
+// 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 (
@@ -8,6 +23,26 @@ import (
 	"github.com/Sirupsen/logrus"
 )
 
+func init() {
+	setSyslogFormatter = func(appname, local string) error {
+		if appname == "" {
+			return fmt.Errorf("missing appname parameter")
+		}
+		if local == "" {
+			return fmt.Errorf("missing local parameter")
+		}
+
+		fmter, err := newSyslogger(appname, local, origLogger.Formatter)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "error creating syslog formatter: %v\n", err)
+			origLogger.Errorf("can't connect logger to syslog: %v", err)
+			return err
+		}
+		origLogger.Formatter = fmter
+		return nil
+	}
+}
+
 var ceeTag = []byte("@cee:")
 
 type syslogger struct {

vendor/vendor.json

@@ -164,8 +164,8 @@
 		},
 		{
 			"path": "github.com/prometheus/common/log",
-			"revision": "4fdc91a58c9d3696b982e8a680f4997403132d44",
+			"revision": "0a3005bb37bc411040083a55372e77c405f6464c",
-			"revisionTime": "2015-10-26T12:04:34+01:00"
+			"revisionTime": "2016-01-04T14:47:38+01:00"
 		},
 		{
 			"path": "github.com/prometheus/common/model",