serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-28 12:55:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

caddyfile: Move metrics into caddy package

Browse source
This commit is contained in:
Matthew Holt 2019-06-21 08:02:53 -06:00
parent 05b3938556
commit 5f9cba0f19
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
caddy.go
View file

@ -600,6 +600,12 @@ func ValidateAndExecuteDirectives(cdyfile Input, inst *Instance, justValidate bo
return err return err
} }
for _, sb := range sblocks {
for dir := range sb.Tokens {
telemetry.AppendUnique("directives", dir)
}
}
inst.context = stype.NewContext(inst) inst.context = stype.NewContext(inst)
if inst.context == nil { if inst.context == nil {
return fmt.Errorf("server type %s produced a nil Context", stypeName) return fmt.Errorf("server type %s produced a nil Context", stypeName)

3
caddyfile/parse.go
View file

@ -20,8 +20,6 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/mholt/caddy/telemetry"
) )
// Parse parses the input just enough to group tokens, in // Parse parses the input just enough to group tokens, in
@ -353,7 +351,6 @@ func (p *parser) directive() error {
// The directive itself is appended as a relevant token // The directive itself is appended as a relevant token
p.block.Tokens[dir] = append(p.block.Tokens[dir], p.tokens[p.cursor]) p.block.Tokens[dir] = append(p.block.Tokens[dir], p.tokens[p.cursor])
telemetry.AppendUnique("directives", dir)
for p.Next() { for p.Next() {
if p.Val() == "{" { if p.Val() == "{" {