Make RegisterPlugin() more consistent, having name as first argument

caddyhttp/basicauth/setup.go

@@ -8,8 +8,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("basicauth", caddy.Plugin{
-		Name:       "basicauth",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/bind/bind.go

@@ -6,8 +6,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("bind", caddy.Plugin{
-		Name:       "bind",
 		ServerType: "http",
 		Action:     setupBind,
 	})

caddyhttp/browse/setup.go

@@ -11,8 +11,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("browse", caddy.Plugin{
-		Name:       "browse",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/errors/errors.go

@@ -16,8 +16,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("errors", caddy.Plugin{
-		Name:       "errors",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/expvar/setup.go

@@ -10,8 +10,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("expvar", caddy.Plugin{
-		Name:       "expvar",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/extensions/setup.go

@@ -6,8 +6,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("ext", caddy.Plugin{
-		Name:       "ext",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/fastcgi/setup.go

@@ -10,8 +10,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("fastcgi", caddy.Plugin{
-		Name:       "fastcgi",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/gzip/gzip.go

@@ -17,8 +17,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("gzip", caddy.Plugin{
-		Name:       "gzip",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/header/setup.go

@@ -6,8 +6,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("header", caddy.Plugin{
-		Name:       "header",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/internalsrv/setup.go

@@ -6,8 +6,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("internal", caddy.Plugin{
-		Name:       "internal",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/log/log.go

@@ -11,8 +11,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("log", caddy.Plugin{
-		Name:       "log",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/markdown/setup.go

@@ -10,8 +10,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("markdown", caddy.Plugin{
-		Name:       "markdown",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/mime/setup.go

@@ -9,8 +9,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("mime", caddy.Plugin{
-		Name:       "mime",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/pprof/setup.go

@@ -6,8 +6,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("pprof", caddy.Plugin{
-		Name:       "pprof",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/proxy/setup.go

@@ -6,8 +6,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("proxy", caddy.Plugin{
-		Name:       "proxy",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/redirect/setup.go

@@ -8,8 +8,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("redir", caddy.Plugin{
-		Name:       "redir",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/rewrite/setup.go

@@ -10,8 +10,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("rewrite", caddy.Plugin{
-		Name:       "rewrite",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/root/root.go

@@ -9,8 +9,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("root", caddy.Plugin{
-		Name:       "root",
 		ServerType: "http",
 		Action:     setupRoot,
 	})

caddyhttp/templates/setup.go

@@ -8,8 +8,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("templates", caddy.Plugin{
-		Name:       "templates",
 		ServerType: "http",
 		Action:     setup,
 	})

caddyhttp/websocket/setup.go

@@ -6,8 +6,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("websocket", caddy.Plugin{
-		Name:       "websocket",
 		ServerType: "http",
 		Action:     setup,
 	})

caddytls/setup.go

@@ -16,10 +16,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("tls", caddy.Plugin{Action: setupTLS})
-		Name:   "tls",
-		Action: setupTLS,
-	})
 }
 
 // setupTLS sets up the TLS configuration and installs certificates that

plugins.go

@@ -135,11 +135,6 @@ type ServerType struct {
 
 // Plugin is a type which holds information about a plugin.
 type Plugin struct {
-	// The plugin must have a name: lower case and one word.
-	// If this plugin has an action, it must be the name of
-	// the directive to attach to. A name is always required.
-	Name string
-
 	// ServerType is the type of server this plugin is for.
 	// Can be empty if not applicable, or if the plugin
 	// can associate with any server type.
@@ -154,17 +149,22 @@ type Plugin struct {
 // themselves, even if they do not perform an action associated
 // with a directive. It is important for the process to know
 // which plugins are available.
-func RegisterPlugin(plugin Plugin) {
+//
-	if plugin.Name == "" {
+// The plugin MUST have a name: lower case and one word.
+// If this plugin has an action, it must be the name of
+// the directive that invokes it. A name is always required
+// and must be unique for the server type.
+func RegisterPlugin(name string, plugin Plugin) {
+	if name == "" {
 		panic("plugin must have a name")
 	}
 	if _, ok := plugins[plugin.ServerType]; !ok {
 		plugins[plugin.ServerType] = make(map[string]Plugin)
 	}
-	if _, dup := plugins[plugin.ServerType][plugin.Name]; dup {
+	if _, dup := plugins[plugin.ServerType][name]; dup {
-		panic("plugin named " + plugin.Name + " already registered for server type " + plugin.ServerType)
+		panic("plugin named " + name + " already registered for server type " + plugin.ServerType)
 	}
-	plugins[plugin.ServerType][plugin.Name] = plugin
+	plugins[plugin.ServerType][name] = plugin
 }
 
 // RegisterParsingCallback registers callback to be called after

startupshutdown/startupshutdown.go

@@ -9,14 +9,8 @@ import (
 )
 
 func init() {
-	caddy.RegisterPlugin(caddy.Plugin{
+	caddy.RegisterPlugin("startup", caddy.Plugin{Action: Startup})
-		Name:   "startup",
+	caddy.RegisterPlugin("shutdown", caddy.Plugin{Action: Shutdown})
-		Action: Startup,
-	})
-	caddy.RegisterPlugin(caddy.Plugin{
-		Name:   "shutdown",
-		Action: Shutdown,
-	})
 }
 
 // Startup registers a startup callback to execute during server start.