startup/shutdown: Remove deprecated startup/shutdown directives (#2033)

* caddy: Remove deprecated startup/shutdown directives * caddyhttp: Remove deprecated startup/shutdown directives Users should use 'on startup' and 'on shutdown' instead.
caddyserver · Feb 21, 2018 · 5552dcb · 5552dcb
1 parent 37b291f
commit 5552dcb
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 169 deletions.
diff --git a/caddyhttp/caddyhttp.go b/caddyhttp/caddyhttp.go
@@ -46,5 +46,4 @@ import (
 	_ "github.com/mholt/caddy/caddyhttp/timeouts"
 	_ "github.com/mholt/caddy/caddyhttp/websocket"
 	_ "github.com/mholt/caddy/onevent"
-	_ "github.com/mholt/caddy/startupshutdown"
 )
diff --git a/caddyhttp/caddyhttp_test.go b/caddyhttp/caddyhttp_test.go
@@ -25,7 +25,7 @@ import (
 // ensure that the standard plugins are in fact plugged in
 // and registered properly; this is a quick/naive way to do it.
 func TestStandardPlugins(t *testing.T) {
-	numStandardPlugins := 33 // importing caddyhttp plugs in this many plugins
+	numStandardPlugins := 31 // importing caddyhttp plugs in this many plugins
 	s := caddy.DescribePlugins()
 	if got, want := strings.Count(s, "\n"), numStandardPlugins+5; got != want {
 		t.Errorf("Expected all standard plugins to be plugged in, got:\n%s", s)

diff --git a/startupshutdown/startupshutdown.go b/startupshutdown/startupshutdown.go
diff --git a/startupshutdown/startupshutdown_test.go b/startupshutdown/startupshutdown_test.go