Commitc7e18f5

authored

Do not use boltdb-shipper if no ring or address are given. (grafana#5902)

1 parenta6bec98 commitc7e18f5Copy full SHA for c7e18f5

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,8 @@ func NewIndexClient(name string, cfg Config, schemaCfg config.SchemaConfig, limi`
`144`	`144`	`ifboltDBIndexClientWithShipper!=nil {`
`145`	`145`	`returnboltDBIndexClientWithShipper,nil`
`146`	`146`	`}`
`147`		`-ifcfg.BoltDBShipperConfig.Mode==shipper.ModeReadOnly&&cfg.BoltDBShipperConfig.IndexGatewayClientConfig.Address!="" {`
	`147`	`+ifcfg.BoltDBShipperConfig.Mode==shipper.ModeReadOnly&&`
	`148`	`+(cfg.BoltDBShipperConfig.IndexGatewayClientConfig.Address!=""\|\|cfg.BoltDBShipperConfig.IndexGatewayClientConfig.Ring!=nil) {`
`148`	`149`	`gateway,err:=shipper.NewGatewayClient(cfg.BoltDBShipperConfig.IndexGatewayClientConfig,registerer,util_log.Logger)`
`149`	`150`	`iferr!=nil {`
`150`	`151`	`returnnil,err`

Comments

(0)