From 25385aafcbe0adef24ddefb72a561d491a060b09 Mon Sep 17 00:00:00 2001
From: beorn7 <beorn@soundcloud.com>
Date: Wed, 20 Jul 2016 17:27:39 +0200
Subject: [PATCH 1/2] Explicitly add logging flags to our custom flag set

In https://github.com/prometheus/prometheus/pull/1782 , we moved to a
custom flag set to avoid getting test flags into the main prometheus
binary. However, that removed the logging flags, too. This commit
updates the vendoring to a version of the log package that allows
adding the log flags to our flag set explicitly.
---
 cmd/prometheus/config.go                       |  3 +++
 vendor/github.com/prometheus/common/log/log.go | 14 ++++++++++----
 vendor/vendor.json                             |  6 +++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/cmd/prometheus/config.go b/cmd/prometheus/config.go
index f2b3978b6..5a4fd3905 100644
--- a/cmd/prometheus/config.go
+++ b/cmd/prometheus/config.go
@@ -238,6 +238,9 @@ func init() {
 		&cfg.queryEngine.MaxConcurrentQueries, "query.max-concurrency", 20,
 		"Maximum number of queries executed concurrently.",
 	)
+
+	// Copy the flags from the log package into our own flag set.
+	log.AddFlags(cfg.fs)
 }
 
 func parse(args []string) error {
diff --git a/vendor/github.com/prometheus/common/log/log.go b/vendor/github.com/prometheus/common/log/log.go
index fb9ec44ec..47e58c153 100644
--- a/vendor/github.com/prometheus/common/log/log.go
+++ b/vendor/github.com/prometheus/common/log/log.go
@@ -91,10 +91,16 @@ func (f logFormatFlag) Set(format string) error {
 }
 
 func init() {
-	// In order for these flags to take effect, the user of the package must call
-	// flag.Parse() before logging anything.
-	flag.Var(levelFlag{}, "log.level", "Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal].")
-	flag.Var(logFormatFlag{}, "log.format", "If set use a syslog logger or JSON logging. Example: logger:syslog?appname=bob&local=7 or logger:stdout?json=true. Defaults to stderr.")
+	AddFlags(flag.CommandLine)
+}
+
+// AddFlags adds the flags used by this package to the given FlagSet. That's
+// useful if working with a custom FlagSet. The init function of this package
+// adds the flags to flag.CommandLine anyway. Thus, it's usually enough to call
+// flag.Parse() to make the logging flags take effect.
+func AddFlags(fs *flag.FlagSet) {
+	fs.Var(levelFlag{}, "log.level", "Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal].")
+	fs.Var(logFormatFlag{}, "log.format", "If set use a syslog logger or JSON logging. Example: logger:syslog?appname=bob&local=7 or logger:stdout?json=true. Defaults to stderr.")
 }
 
 type Logger interface {
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 850541e07..6142d2992 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -175,10 +175,10 @@
 			"revisionTime": "2016-06-23T15:14:27Z"
 		},
 		{
-			"checksumSHA1": "qHoBp/PVBcLedTNZrF3toV9QGa0=",
+			"checksumSHA1": "fKMoxZehNhXbklRQy7lpFAVH0XY=",
 			"path": "github.com/prometheus/common/log",
-			"revision": "4402f4e5ea79ec15f3c574773b6a5198fbea215f",
-			"revisionTime": "2016-06-23T15:14:27Z"
+			"revision": "610701b0cb96fe82d0166b8e07979b174b6f06ae",
+			"revisionTime": "2016-07-20T15:23:54Z"
 		},
 		{
 			"checksumSHA1": "Jx0GXl5hGnO25s3ryyvtdWHdCpw=",

From bf6201483c79d6ae54a290105fc3d6e32ad5a794 Mon Sep 17 00:00:00 2001
From: beorn7 <beorn@soundcloud.com>
Date: Wed, 20 Jul 2016 17:32:42 +0200
Subject: [PATCH 2/2] Improve wording on log flag comment

---
 cmd/prometheus/config.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/prometheus/config.go b/cmd/prometheus/config.go
index 5a4fd3905..56d8f00a1 100644
--- a/cmd/prometheus/config.go
+++ b/cmd/prometheus/config.go
@@ -239,7 +239,7 @@ func init() {
 		"Maximum number of queries executed concurrently.",
 	)
 
-	// Copy the flags from the log package into our own flag set.
+	// Flags from the log package have to be added explicitly to our custom flag set.
 	log.AddFlags(cfg.fs)
 }