fix(plugins): rename wapper to wrapper

caicloud · Jun 22, 2018 · 08f8b65 · 08f8b65
1 parent b26646f
commit 08f8b65
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 34 deletions.
diff --git a/plugins/healthcheck/healthz.go b/plugins/healthcheck/healthz.go
@@ -54,7 +54,7 @@ func (i *healthcheckInstaller) Name() string {
 // Install installs stuffs before server starting.
 func (i *healthcheckInstaller) Install(builder service.Builder, cfg *nirvana.Config) error {
 	var err error
-	wapper(cfg, func(c *config) {
+	wrapper(cfg, func(c *config) {
 		err = builder.AddDescriptor(definition.Descriptor{
 			Path:     c.path,
 			Consumes: []string{definition.MIMEAll},
@@ -88,7 +88,7 @@ func Path(path string) nirvana.Configurer {
 		path = "/healthz"
 	}
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.path = path
 		})
 		return nil
@@ -101,14 +101,14 @@ func Checker(checker HealthChecker) nirvana.Configurer {
 		checker = defaultHealthChecker
 	}
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.checker = checker
 		})
 		return nil
 	}
 }
 
-func wapper(c *nirvana.Config, f func(c *config)) {
+func wrapper(c *nirvana.Config, f func(c *config)) {
 	conf := c.Config(ExternalConfigName)
 	var cfg *config
 	if conf == nil {

diff --git a/plugins/metrics/metrics.go b/plugins/metrics/metrics.go
@@ -111,7 +111,7 @@ func (i *metricsInstaller) Name() string {
 // Install installs stuffs before server starting.
 func (i *metricsInstaller) Install(builder service.Builder, cfg *nirvana.Config) error {
 	var err error
-	wapper(cfg, func(c *config) {
+	wrapper(cfg, func(c *config) {
 
 		monitorMiddleware := definition.Descriptor{
 			Path:        "/",
@@ -139,13 +139,13 @@ func Disable() nirvana.Configurer {
 // Default Configurer does nothing but ensure default config was set.
 func Default() nirvana.Configurer {
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 		})
 		return nil
 	}
 }
 
-func wapper(c *nirvana.Config, f func(c *config)) {
+func wrapper(c *nirvana.Config, f func(c *config)) {
 	conf := c.Config(ExternalConfigName)
 	var cfg *config
 	if conf == nil {
@@ -168,7 +168,7 @@ func Path(path string) nirvana.Configurer {
 		path = "/metrics"
 	}
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.path = path
 		})
 		return nil
@@ -181,7 +181,7 @@ func Namespace(ns string) nirvana.Configurer {
 		ns = "nirvana"
 	}
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.namespace = ns
 		})
 		return nil

diff --git a/plugins/profiling/profiling.go b/plugins/profiling/profiling.go
@@ -52,7 +52,7 @@ func (i *profilingInstaller) Name() string {
 // Install installs config to builder.
 func (i *profilingInstaller) Install(builder service.Builder, cfg *nirvana.Config) error {
 	var err error
-	wapper(cfg, func(c *config) {
+	wrapper(cfg, func(c *config) {
 		if err = builder.AddDescriptor(descriptor(c.path)); err != nil {
 			return
 		}
@@ -76,7 +76,7 @@ func Disable() nirvana.Configurer {
 	}
 }
 
-func wapper(c *nirvana.Config, f func(c *config)) {
+func wrapper(c *nirvana.Config, f func(c *config)) {
 	conf := c.Config(ExternalConfigName)
 	var cfg *config
 	if conf == nil {
@@ -103,7 +103,7 @@ func Path(path string) nirvana.Configurer {
 		path = "/debug/pprof/"
 	}
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.path = path
 		})
 		return nil
@@ -115,7 +115,7 @@ func Path(path string) nirvana.Configurer {
 // Defaults to false.
 func Contention(enable bool) nirvana.Configurer {
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.contention = enable
 		})
 		return nil

diff --git a/plugins/reqlog/reqlog.go b/plugins/reqlog/reqlog.go
@@ -52,7 +52,7 @@ func (i *reqlogInstaller) Name() string {
 // Install installs stuffs before server starting.
 func (i *reqlogInstaller) Install(builder service.Builder, cfg *nirvana.Config) error {
 	var err error
-	wapper(cfg, func(c *config) {
+	wrapper(cfg, func(c *config) {
 		begin, end := i.buildPrinters(c)
 		err = builder.AddDescriptor(definition.Descriptor{
 			Path: "/",
@@ -190,7 +190,7 @@ func Disable() nirvana.Configurer {
 // Default Configurer does nothing but ensure default config was set.
 func Default() nirvana.Configurer {
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.logger = nil
 		})
 		return nil
@@ -200,7 +200,7 @@ func Default() nirvana.Configurer {
 // Logger Configurer sets logger.
 func Logger(l log.Logger) nirvana.Configurer {
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.logger = l
 		})
 		return nil
@@ -215,7 +215,7 @@ func Logger(l log.Logger) nirvana.Configurer {
 // Defaults to false.
 func DoubleLog(enable bool) nirvana.Configurer {
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.doubleLog = enable
 		})
 		return nil
@@ -227,7 +227,7 @@ func DoubleLog(enable bool) nirvana.Configurer {
 // Defaults to false.
 func SourceAddr(enable bool) nirvana.Configurer {
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.sourceAddr = enable
 		})
 		return nil
@@ -239,7 +239,7 @@ func SourceAddr(enable bool) nirvana.Configurer {
 // Defaults to false.
 func RequestID(enable bool) nirvana.Configurer {
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.requestID = enable
 		})
 		return nil
@@ -254,14 +254,14 @@ func RequestIDKey(key string) nirvana.Configurer {
 		key = "X-Request-Id"
 	}
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.requestKey = key
 		})
 		return nil
 	}
 }
 
-func wapper(c *nirvana.Config, f func(c *config)) {
+func wrapper(c *nirvana.Config, f func(c *config)) {
 	conf := c.Config(ExternalConfigName)
 	var cfg *config
 	if conf == nil {

diff --git a/plugins/tracing/tracing.go b/plugins/tracing/tracing.go
@@ -57,7 +57,7 @@ func (i *tracingInstaller) Name() string {
 // Install installs config to builder.
 func (i *tracingInstaller) Install(builder service.Builder, cfg *nirvana.Config) error {
 	var err error
-	wapper(cfg, func(c *config) {
+	wrapper(cfg, func(c *config) {
 		if c.tracer == nil {
 			tcfg := tconfig.Configuration{
 				ServiceName: c.serviceName,
@@ -87,7 +87,7 @@ func (i *tracingInstaller) Install(builder service.Builder, cfg *nirvana.Config)
 // Uninstall uninstalls stuffs after server terminating.
 func (i *tracingInstaller) Uninstall(builder service.Builder, cfg *nirvana.Config) error {
 	var err error
-	wapper(cfg, func(c *config) {
+	wrapper(cfg, func(c *config) {
 		if c.closer != nil {
 			err = c.closer.Close()
 		}
@@ -103,7 +103,7 @@ func Disable() nirvana.Configurer {
 	}
 }
 
-func wapper(c *nirvana.Config, f func(c *config)) {
+func wrapper(c *nirvana.Config, f func(c *config)) {
 	conf := c.Config(ExternalConfigName)
 	var cfg *config
 	if conf == nil {
@@ -120,7 +120,7 @@ func wapper(c *nirvana.Config, f func(c *config)) {
 // CustomTracer returns a configurer to set custom tracer.
 func CustomTracer(tracer opentracing.Tracer) nirvana.Configurer {
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.tracer = tracer
 		})
 		return nil
@@ -130,7 +130,7 @@ func CustomTracer(tracer opentracing.Tracer) nirvana.Configurer {
 // DefaultTracer returns a configurer to create default tracer by service and port.
 func DefaultTracer(serviceName string, agentHostPort string) nirvana.Configurer {
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.serviceName = serviceName
 			c.agentHostPort = agentHostPort
 		})
@@ -141,7 +141,7 @@ func DefaultTracer(serviceName string, agentHostPort string) nirvana.Configurer
 // AddHook returns a configurer to set request hook.
 func AddHook(hook Hook) nirvana.Configurer {
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.hook = hook
 		})
 		return nil

diff --git a/plugins/version/version.go b/plugins/version/version.go
@@ -57,7 +57,7 @@ func (i *versionInstaller) Name() string {
 // Install installs stuffs before server starting.
 func (i *versionInstaller) Install(builder service.Builder, cfg *nirvana.Config) error {
 	var err error
-	wapper(cfg, func(c *config) {
+	wrapper(cfg, func(c *config) {
 		v := &version{
 			Name:        c.name,
 			Version:     c.version,
@@ -99,7 +99,7 @@ func Path(path string) nirvana.Configurer {
 		path = "/version"
 	}
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.path = path
 		})
 		return nil
@@ -109,7 +109,7 @@ func Path(path string) nirvana.Configurer {
 // Name Configurer sets project name.
 func Name(name string) nirvana.Configurer {
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.name = name
 		})
 		return nil
@@ -119,7 +119,7 @@ func Name(name string) nirvana.Configurer {
 // Description Configurer sets project description.
 func Description(description string) nirvana.Configurer {
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.description = description
 		})
 		return nil
@@ -129,7 +129,7 @@ func Description(description string) nirvana.Configurer {
 // Version Configurer sets version number.
 func Version(version string) nirvana.Configurer {
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.version = version
 		})
 		return nil
@@ -139,14 +139,14 @@ func Version(version string) nirvana.Configurer {
 // Hash Configurer sets code hash.
 func Hash(hash string) nirvana.Configurer {
 	return func(c *nirvana.Config) error {
-		wapper(c, func(c *config) {
+		wrapper(c, func(c *config) {
 			c.hash = hash
 		})
 		return nil
 	}
 }
 
-func wapper(c *nirvana.Config, f func(c *config)) {
+func wrapper(c *nirvana.Config, f func(c *config)) {
 	conf := c.Config(ExternalConfigName)
 	var cfg *config
 	if conf == nil {