MM-34932: Bump dependencies (#17708)
https://mattermost.atlassian.net/browse/MM-34932 ```release-note NONE ```
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
fff09bf210
Коммит
3299a72adb
11
vendor/github.com/hashicorp/go-plugin/client.go
сгенерированный
поставляемый
11
vendor/github.com/hashicorp/go-plugin/client.go
сгенерированный
поставляемый
@@ -209,9 +209,10 @@ type ClientConfig struct {
|
||||
// already-running plugin process. You can retrieve this information by
|
||||
// calling ReattachConfig on Client.
|
||||
type ReattachConfig struct {
|
||||
Protocol Protocol
|
||||
Addr net.Addr
|
||||
Pid int
|
||||
Protocol Protocol
|
||||
ProtocolVersion int
|
||||
Addr net.Addr
|
||||
Pid int
|
||||
|
||||
// Test is set to true if this is reattaching to to a plugin in "test mode"
|
||||
// (see ServeConfig.Test). In this mode, client.Kill will NOT kill the
|
||||
@@ -839,6 +840,10 @@ func (c *Client) reattach() (net.Addr, error) {
|
||||
c.protocol = ProtocolNetRPC
|
||||
}
|
||||
|
||||
if c.config.Reattach.Test {
|
||||
c.negotiatedVersion = c.config.Reattach.ProtocolVersion
|
||||
}
|
||||
|
||||
// If we're in test mode, we do NOT set the process. This avoids the
|
||||
// process being killed (the only purpose we have for c.process), since
|
||||
// in test mode the process is responsible for exiting on its own.
|
||||
|
||||
9
vendor/github.com/hashicorp/go-plugin/server.go
сгенерированный
поставляемый
9
vendor/github.com/hashicorp/go-plugin/server.go
сгенерированный
поставляемый
@@ -415,10 +415,11 @@ func Serve(opts *ServeConfig) {
|
||||
// quite ready if they connect immediately but the client should
|
||||
// retry a few times.
|
||||
ch <- &ReattachConfig{
|
||||
Protocol: protoType,
|
||||
Addr: listener.Addr(),
|
||||
Pid: os.Getpid(),
|
||||
Test: true,
|
||||
Protocol: protoType,
|
||||
ProtocolVersion: protoVersion,
|
||||
Addr: listener.Addr(),
|
||||
Pid: os.Getpid(),
|
||||
Test: true,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user