Module.New() does not need to return an error

This commit is contained in:
Matthew Holt
2019-05-21 14:22:21 -06:00
parent 67d32e6779
commit 2fd98cb040
19 changed files with 29 additions and 36 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ func init() {
err := caddy2.RegisterModule(caddy2.Module{
Name: "http",
New: func() (interface{}, error) { return new(App), nil },
New: func() interface{} { return new(App) },
})
if err != nil {
+1 -1
View File
@@ -12,7 +12,7 @@ import (
func init() {
caddy2.RegisterModule(caddy2.Module{
Name: "http.middleware.log",
New: func() (interface{}, error) { return new(Log), nil },
New: func() interface{} { return new(Log) },
})
}
+1 -1
View File
@@ -11,7 +11,7 @@ import (
func init() {
caddy2.RegisterModule(caddy2.Module{
Name: "http.matchers.file",
New: func() (interface{}, error) { return new(FileMatcher), nil },
New: func() interface{} { return new(FileMatcher) },
})
}
+1 -1
View File
@@ -21,7 +21,7 @@ func init() {
caddy2.RegisterModule(caddy2.Module{
Name: "http.responders.file_server",
New: func() (interface{}, error) { return new(FileServer), nil },
New: func() interface{} { return new(FileServer) },
})
}
+1 -1
View File
@@ -11,7 +11,7 @@ import (
func init() {
caddy2.RegisterModule(caddy2.Module{
Name: "http.middleware.headers",
New: func() (interface{}, error) { return new(Headers), nil },
New: func() interface{} { return new(Headers) },
})
}
+9 -9
View File
@@ -32,39 +32,39 @@ type (
func init() {
caddy2.RegisterModule(caddy2.Module{
Name: "http.matchers.host",
New: func() (interface{}, error) { return matchHost{}, nil },
New: func() interface{} { return matchHost{} },
})
caddy2.RegisterModule(caddy2.Module{
Name: "http.matchers.path",
New: func() (interface{}, error) { return matchPath{}, nil },
New: func() interface{} { return matchPath{} },
})
caddy2.RegisterModule(caddy2.Module{
Name: "http.matchers.path_regexp",
New: func() (interface{}, error) { return new(matchPathRE), nil },
New: func() interface{} { return new(matchPathRE) },
})
caddy2.RegisterModule(caddy2.Module{
Name: "http.matchers.method",
New: func() (interface{}, error) { return matchMethod{}, nil },
New: func() interface{} { return matchMethod{} },
})
caddy2.RegisterModule(caddy2.Module{
Name: "http.matchers.query",
New: func() (interface{}, error) { return matchQuery{}, nil },
New: func() interface{} { return matchQuery{} },
})
caddy2.RegisterModule(caddy2.Module{
Name: "http.matchers.header",
New: func() (interface{}, error) { return matchHeader{}, nil },
New: func() interface{} { return matchHeader{} },
})
caddy2.RegisterModule(caddy2.Module{
Name: "http.matchers.header_regexp",
New: func() (interface{}, error) { return matchHeaderRE{}, nil },
New: func() interface{} { return matchHeaderRE{} },
})
caddy2.RegisterModule(caddy2.Module{
Name: "http.matchers.protocol",
New: func() (interface{}, error) { return new(matchProtocol), nil },
New: func() interface{} { return new(matchProtocol) },
})
caddy2.RegisterModule(caddy2.Module{
Name: "http.matchers.starlark_expr",
New: func() (interface{}, error) { return new(matchStarlarkExpr), nil },
New: func() interface{} { return new(matchStarlarkExpr) },
})
}
+1 -1
View File
@@ -8,6 +8,6 @@ import (
func init() {
caddy2.RegisterModule(caddy2.Module{
Name: "http.responders.reverse_proxy",
New: func() (interface{}, error) { return new(LoadBalanced), nil },
New: func() interface{} { return new(LoadBalanced) },
})
}
+1 -1
View File
@@ -12,7 +12,7 @@ import (
func init() {
caddy2.RegisterModule(caddy2.Module{
Name: "http.middleware.rewrite",
New: func() (interface{}, error) { return new(Rewrite), nil },
New: func() interface{} { return new(Rewrite) },
})
}
+1 -1
View File
@@ -11,7 +11,7 @@ import (
func init() {
caddy2.RegisterModule(caddy2.Module{
Name: "http.responders.static",
New: func() (interface{}, error) { return new(Static), nil },
New: func() interface{} { return new(Static) },
})
}
+2 -2
View File
@@ -9,12 +9,12 @@ import (
func init() {
caddy2.RegisterModule(caddy2.Module{
Name: "http.middleware.table",
New: func() (interface{}, error) { return new(tableMiddleware), nil },
New: func() interface{} { return new(tableMiddleware) },
})
caddy2.RegisterModule(caddy2.Module{
Name: "http.matchers.table",
New: func() (interface{}, error) { return new(tableMatcher), nil },
New: func() interface{} { return new(tableMatcher) },
})
}