mokhtar/local-ip.sh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

smarter structured logs

Browse Source
This commit is contained in:
m5r 2024-07-28 12:15:59 +02:00
parent 1797bca311
commit cd2ed76903
Signed by: mokhtar
GPG Key ID: 1509B54946D08A95
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
http/server.go
View File

@ -20,7 +20,11 @@ func loggingMiddleware(w http.ResponseWriter, r *http.Request, next http.Handler
start := time.Now()
next(w, r)
response := w.(negroni.ResponseWriter)
utils.Logger.Debug().Str("FLY_REGION", flyRegion).Msgf("%s %s %d %s", r.Method, r.URL.Path, response.Status(), time.Since(start))
logEvent := utils.Logger.Debug()
if flyRegion != "" {
logEvent.Str("FLY_REGION", flyRegion)
}
logEvent.Msgf("%s %s %d %s", r.Method, r.URL.Path, response.Status(), time.Since(start))
}
func newHttpMux() http.Handler {

18
xip/xip.go
View File

@ -18,9 +18,10 @@ type Xip struct {
}
var (
flyRegion = os.Getenv("FLY_REGION")
dottedIpV4Regex = regexp.MustCompile(`(?:^|(?:[\w\d])+\.)(((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4})($|[.-])`)
dashedIpV4Regex = regexp.MustCompile(`(?:^|(?:[\w\d])+\.)(((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\-?\b){4})($|[.-])`)
flyRegion = os.Getenv("FLY_REGION")
dottedIpV4Regex = regexp.MustCompile(`(?:^|(?:[\w\d])+\.)(((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4})($|[.-])`)
dashedIpV4Regex = regexp.MustCompile(`(?:^|(?:[\w\d])+\.)(((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\-?\b){4})($|[.-])`)
anyWhitespaceRegex = regexp.MustCompile(`\s`)
)
func (xip *Xip) SetTXTRecord(fqdn string, value string) {
@ -333,10 +334,15 @@ func (xip *Xip) handleDnsRequest(response dns.ResponseWriter, request *dns.Msg)
message.MsgHdr.Rcode = dns.RcodeRefused
}
logEvent := utils.Logger.Debug().Str("FLY_REGION", flyRegion).Str("question", request.Question[0].String())
re := regexp.MustCompile(`\s`)
question := anyWhitespaceRegex.ReplaceAllString(request.Question[0].String(), " ")
logEvent := utils.Logger.Debug().Str("question", question)
if flyRegion != "" {
logEvent.Str("FLY_REGION", flyRegion)
}
for i, answer := range message.Answer {
logEvent.Str(fmt.Sprintf("answers[%d]", i), re.ReplaceAllString(answer.String(), " "))
key := fmt.Sprintf("answers[%d]", i)
value := anyWhitespaceRegex.ReplaceAllString(answer.String(), " ")
logEvent.Str(key, value)
}
logEvent.Msg("resolved")