mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-23 22:27:38 -05:00
a798e0c951
- Server types no longer need to store their own contexts; they are stored on the caddy.Instance, which means each context will be properly GC'ed when the instance is stopped. Server types should use type assertions to convert from caddy.Context to their concrete context type when they need to use it. - Pass the entire context into httpserver.GetConfig instead of only the Key field. - caddy.NewTestController now requires a server type string so it can create a controller with the proper concrete context associated with that server type. Tests still need more attention so that we can test the proper creation of startup functions, etc.
69 lines
1.4 KiB
Go
69 lines
1.4 KiB
Go
package expvar
|
|
|
|
import (
|
|
"expvar"
|
|
"runtime"
|
|
"sync"
|
|
|
|
"github.com/mholt/caddy"
|
|
"github.com/mholt/caddy/caddyhttp/httpserver"
|
|
)
|
|
|
|
func init() {
|
|
caddy.RegisterPlugin("expvar", caddy.Plugin{
|
|
ServerType: "http",
|
|
Action: setup,
|
|
})
|
|
}
|
|
|
|
// setup configures a new ExpVar middleware instance.
|
|
func setup(c *caddy.Controller) error {
|
|
resource, err := expVarParse(c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// publish any extra information/metrics we may want to capture
|
|
publishExtraVars()
|
|
|
|
ev := ExpVar{Resource: resource}
|
|
|
|
httpserver.GetConfig(c).AddMiddleware(func(next httpserver.Handler) httpserver.Handler {
|
|
ev.Next = next
|
|
return ev
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
func expVarParse(c *caddy.Controller) (Resource, error) {
|
|
var resource Resource
|
|
var err error
|
|
|
|
for c.Next() {
|
|
args := c.RemainingArgs()
|
|
switch len(args) {
|
|
case 0:
|
|
resource = Resource(defaultExpvarPath)
|
|
case 1:
|
|
resource = Resource(args[0])
|
|
default:
|
|
return resource, c.ArgErr()
|
|
}
|
|
}
|
|
|
|
return resource, err
|
|
}
|
|
|
|
func publishExtraVars() {
|
|
// By using sync.Once instead of an init() function, we don't clutter
|
|
// the app's expvar export unnecessarily, or risk colliding with it.
|
|
publishOnce.Do(func() {
|
|
expvar.Publish("Goroutines", expvar.Func(func() interface{} {
|
|
return runtime.NumGoroutine()
|
|
}))
|
|
})
|
|
}
|
|
|
|
var publishOnce sync.Once // publishing variables should only be done once
|
|
var defaultExpvarPath = "/debug/vars"
|