scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-04 12:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync in latest go-plugin

Browse Source
This commit is contained in:
Jeff Mitchell
2018-01-17 11:57:17 -05:00
parent 982c1aa972
commit bb45c06371
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vendor/github.com/hashicorp/go-plugin/server.go generated vendored
View File

@@ -66,6 +66,10 @@ type ServeConfig struct {
// the gRPC health checking service. This is not optional since go-plugin // the gRPC health checking service. This is not optional since go-plugin
// relies on this to implement Ping(). // relies on this to implement Ping().
GRPCServer func([]grpc.ServerOption) *grpc.Server GRPCServer func([]grpc.ServerOption) *grpc.Server
// Logger is used to pass a logger into the server. If none is provided the
// server will create a default logger.
Logger hclog.Logger
} }
// Protocol returns the protocol that this server should speak. // Protocol returns the protocol that this server should speak.
@@ -106,12 +110,15 @@ func Serve(opts *ServeConfig) {
// Logging goes to the original stderr // Logging goes to the original stderr
log.SetOutput(os.Stderr) log.SetOutput(os.Stderr)
logger := opts.Logger
if logger == nil {
// internal logger to os.Stderr // internal logger to os.Stderr
logger := hclog.New(&hclog.LoggerOptions{ logger = hclog.New(&hclog.LoggerOptions{
Level: hclog.Trace, Level: hclog.Trace,
Output: os.Stderr, Output: os.Stderr,
JSONFormat: true, JSONFormat: true,
}) })
}
// Create our new stdout, stderr files. These will override our built-in // Create our new stdout, stderr files. These will override our built-in
// stdout/stderr so that it works across the stream boundary. // stdout/stderr so that it works across the stream boundary.

6
vendor/vendor.json vendored
View File

@@ -1021,10 +1021,10 @@
"revisionTime": "2017-06-22T06:09:55Z" "revisionTime": "2017-06-22T06:09:55Z"
}, },
{ {
"checksumSHA1": "tFCvjFzOo0x4P2SEzj8UazxTMug=", "checksumSHA1": "QSH/KjHRLljyZDXMmkd9fdqbr3I=",
"path": "github.com/hashicorp/go-plugin", "path": "github.com/hashicorp/go-plugin",
"revision": "e2fbc6864d18d3c37b6cde4297ec9fca266d28f1", "revision": "e37881a3f1a07fce82b3d99ce0342a72e53386bc",
"revisionTime": "2017-10-29T21:44:25Z" "revisionTime": "2018-01-11T18:21:30Z"
}, },
{ {
"checksumSHA1": "yzoWV7yrS/TvOrKy5ZrdUjsYaOA=", "checksumSHA1": "yzoWV7yrS/TvOrKy5ZrdUjsYaOA=",