DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix error loading modules (#2141)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-02-24 18:09:23 -03:00 committed by GitHub
parent 94a85c99f7
commit a8ce680d43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
internal/ingress/controller/template/template.go
View file

@ -729,14 +729,17 @@ func buildOpentracingLoad(input interface{}) string {
return "" return ""
} }
buf := bytes.NewBufferString("load_module/etc/nginx/modules/ngx_http_opentracing_module.so;") buf := bytes.NewBufferString("load_module /etc/nginx/modules/ngx_http_opentracing_module.so;")
buf.WriteString("\r\n")
if cfg.ZipkinCollectorHost != "" { if cfg.ZipkinCollectorHost != "" {
buf.WriteString("load_module/etc/nginx/modules/ngx_http_zipkin_module.so;") buf.WriteString("load_module /etc/nginx/modules/ngx_http_zipkin_module.so;")
} else if cfg.JaegerCollectorHost != "" { } else if cfg.JaegerCollectorHost != "" {
buf.WriteString("load_module/etc/nginx/modules/ngx_http_jaeger_module.so;") buf.WriteString("load_module /etc/nginx/modules/ngx_http_jaeger_module.so;")
} }
buf.WriteString("\r\n")
return buf.String() return buf.String()
} }
@ -755,14 +758,20 @@ func buildOpentracing(input interface{}) string {
if cfg.ZipkinCollectorHost != "" { if cfg.ZipkinCollectorHost != "" {
buf.WriteString(fmt.Sprintf("zipkin_collector_host %v;", cfg.ZipkinCollectorHost)) buf.WriteString(fmt.Sprintf("zipkin_collector_host %v;", cfg.ZipkinCollectorHost))
buf.WriteString("\r\n")
buf.WriteString(fmt.Sprintf("zipkin_collector_port %v;", cfg.ZipkinCollectorPort)) buf.WriteString(fmt.Sprintf("zipkin_collector_port %v;", cfg.ZipkinCollectorPort))
buf.WriteString("\r\n")
buf.WriteString(fmt.Sprintf("zipkin_service_name %v;", cfg.ZipkinServiceName)) buf.WriteString(fmt.Sprintf("zipkin_service_name %v;", cfg.ZipkinServiceName))
} else if cfg.JaegerCollectorHost != "" { } else if cfg.JaegerCollectorHost != "" {
buf.WriteString(fmt.Sprintf("jaeger_reporter_local_agent_host_port %v:%v;", cfg.JaegerCollectorHost, cfg.JaegerCollectorPort)) buf.WriteString(fmt.Sprintf("jaeger_reporter_local_agent_host_port %v:%v;", cfg.JaegerCollectorHost, cfg.JaegerCollectorPort))
buf.WriteString("\r\n")
buf.WriteString(fmt.Sprintf("jaeger_service_name %v;", cfg.JaegerServiceName)) buf.WriteString(fmt.Sprintf("jaeger_service_name %v;", cfg.JaegerServiceName))
buf.WriteString("\r\n")
buf.WriteString(fmt.Sprintf("jaeger_sampler_type %v;", cfg.JaegerSamplerType)) buf.WriteString(fmt.Sprintf("jaeger_sampler_type %v;", cfg.JaegerSamplerType))
buf.WriteString("\r\n")
buf.WriteString(fmt.Sprintf("jaeger_sampler_param %v;", cfg.JaegerSamplerParam)) buf.WriteString(fmt.Sprintf("jaeger_sampler_param %v;", cfg.JaegerSamplerParam))
} }
buf.WriteString("\r\n")
return buf.String() return buf.String()
} }