1
0
mirror of https://github.com/prometheus-community/postgres_exporter.git synced 2025-08-15 12:42:33 +03:00

Update all dependencies.

* Switch to using kingpin for CLI interface as upstream Prometheus has moved
  that way too.
This commit is contained in:
Will Rouesnel
2017-10-24 21:16:28 +11:00
parent 5c04bc0463
commit 0e4c3ce395
413 changed files with 80471 additions and 27437 deletions

View File

@@ -84,9 +84,15 @@ func mergeStruct(out, in reflect.Value) {
mergeAny(out.Field(i), in.Field(i), false, sprop.Prop[i])
}
if emIn, ok := in.Addr().Interface().(extendableProto); ok {
emOut := out.Addr().Interface().(extendableProto)
mergeExtension(emOut.ExtensionMap(), emIn.ExtensionMap())
if emIn, ok := extendable(in.Addr().Interface()); ok {
emOut, _ := extendable(out.Addr().Interface())
mIn, muIn := emIn.extensionsRead()
if mIn != nil {
mOut := emOut.extensionsWrite()
muIn.Lock()
mergeExtension(mOut, mIn)
muIn.Unlock()
}
}
uf := in.FieldByName("XXX_unrecognized")