Merge branch 'main' into dev

This commit is contained in:
Derek Collison
2023-03-19 11:55:45 -07:00
11 changed files with 510 additions and 53 deletions

View File

@@ -22,6 +22,7 @@ import (
"fmt"
"math/rand"
"net/http"
"runtime"
"strconv"
"strings"
"sync"
@@ -634,7 +635,7 @@ func (s *Server) updateServerUsage(v *ServerStats) {
defer s.mu.Lock()
var vss int64
pse.ProcUsage(&v.CPU, &v.Mem, &vss)
v.Cores = numCores
v.Cores = runtime.NumCPU()
}
// Generate a route stat for our statz update.