Fix nil pointer dereference when a sink return (nil, err)

ryarnyah · ryarnyah · commit b3cfb105c201 · 2018-01-26T07:24:46.000+01:00
diff --git a/events/sinks/factory.go b/events/sinks/factory.go
@@ -59,7 +59,7 @@ func (this *SinkFactory) BuildAll(uris flags.Uris) []core.EventSink {
 	for _, uri := range uris {
 		sink, err := this.Build(uri)
 		if err != nil {
-			glog.Errorf("Failed to create sink: %v", err)
+			glog.Errorf("Failed to create %s sink: %v", uri, err)
 			continue
 		}
 		result = append(result, sink)
diff --git a/metrics/sinks/factory.go b/metrics/sinks/factory.go
@@ -87,7 +87,7 @@ func (this *SinkFactory) BuildAll(uris flags.Uris, historicalUri string, disable
 	for _, uri := range uris {
 		sink, err := this.Build(uri)
 		if err != nil {
-			glog.Errorf("Failed to create %s sink: %v", sink.Name(), err)
+			glog.Errorf("Failed to create %s sink: %v", uri, err)
 			continue
 		}
 		if uri.Key == "metric" {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func (this *SinkFactory) BuildAll(uris flags.Uris) []core.EventSink {`
`59`	`59`	`for _, uri := range uris {`
`60`	`60`	`sink, err := this.Build(uri)`
`61`	`61`	`if err != nil {`
`62`		`- glog.Errorf("Failed to create sink: %v", err)`
	`62`	`+ glog.Errorf("Failed to create %s sink: %v", uri, err)`
`63`	`63`	`continue`
`64`	`64`	`}`
`65`	`65`	`result = append(result, sink)`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func (this *SinkFactory) BuildAll(uris flags.Uris, historicalUri string, disable`
`87`	`87`	`for _, uri := range uris {`
`88`	`88`	`sink, err := this.Build(uri)`
`89`	`89`	`if err != nil {`
`90`		`- glog.Errorf("Failed to create %s sink: %v", sink.Name(), err)`
	`90`	`+ glog.Errorf("Failed to create %s sink: %v", uri, err)`
`91`	`91`	`continue`
`92`	`92`	`}`
`93`	`93`	`if uri.Key == "metric" {`