@@ -44,16 +44,17 @@ type HealthChecker func(addr string) bool
44
44
// It can be spawned manually or through one of the available
45
45
// helper methods.
46
46
type VtProcess struct {
47
- Name string
48
- Directory string
49
- LogDirectory string
50
- Binary string
51
- ExtraArgs []string
52
- Env []string
53
- BindAddress string
54
- Port int
55
- PortGrpc int
56
- HealthCheck HealthChecker
47
+ Name string
48
+ Directory string
49
+ LogDirectory string
50
+ Binary string
51
+ ExtraArgs []string
52
+ Env []string
53
+ BindAddress string
54
+ BindAddressGprc string
55
+ Port int
56
+ PortGrpc int
57
+ HealthCheck HealthChecker
57
58
58
59
proc * exec.Cmd
59
60
exit chan error
@@ -139,6 +140,11 @@ func (vtp *VtProcess) WaitStart() (err error) {
139
140
vtp .proc .Args = append (vtp .proc .Args , fmt .Sprintf ("%d" , vtp .PortGrpc ))
140
141
}
141
142
143
+ if vtp .BindAddressGprc != "" {
144
+ vtp .proc .Args = append (vtp .proc .Args , "--grpc_bind_address" )
145
+ vtp .proc .Args = append (vtp .proc .Args , vtp .BindAddressGprc )
146
+ }
147
+
142
148
vtp .proc .Args = append (vtp .proc .Args , vtp .ExtraArgs ... )
143
149
vtp .proc .Env = append (vtp .proc .Env , os .Environ ()... )
144
150
vtp .proc .Env = append (vtp .proc .Env , vtp .Env ... )
@@ -199,16 +205,22 @@ func VtcomboProcess(environment Environment, args *Config, mysql MySQLManager) (
199
205
if args .VtComboBindAddress != "" {
200
206
vtcomboBindAddress = args .VtComboBindAddress
201
207
}
208
+ grpcBindAddress := "127.0.0.1"
209
+ if servenv .GRPCBindAddress () != "" {
210
+ grpcBindAddress = servenv .GRPCBindAddress ()
211
+ }
212
+
202
213
vt := & VtProcess {
203
- Name : "vtcombo" ,
204
- Directory : environment .Directory (),
205
- LogDirectory : environment .LogDirectory (),
206
- Binary : environment .BinaryPath ("vtcombo" ),
207
- BindAddress : vtcomboBindAddress ,
208
- Port : environment .PortForProtocol ("vtcombo" , "" ),
209
- PortGrpc : environment .PortForProtocol ("vtcombo" , "grpc" ),
210
- HealthCheck : environment .ProcessHealthCheck ("vtcombo" ),
211
- Env : environment .EnvVars (),
214
+ Name : "vtcombo" ,
215
+ Directory : environment .Directory (),
216
+ LogDirectory : environment .LogDirectory (),
217
+ Binary : environment .BinaryPath ("vtcombo" ),
218
+ BindAddress : vtcomboBindAddress ,
219
+ BindAddressGprc : grpcBindAddress ,
220
+ Port : environment .PortForProtocol ("vtcombo" , "" ),
221
+ PortGrpc : environment .PortForProtocol ("vtcombo" , "grpc" ),
222
+ HealthCheck : environment .ProcessHealthCheck ("vtcombo" ),
223
+ Env : environment .EnvVars (),
212
224
}
213
225
214
226
user , pass := mysql .Auth ()
0 commit comments