gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Derek Collison
2023-05-12 12:38:20 -07:00
parent 11e364d9c0 fc64c6119d
commit 4c26cbb3de
7 changed files with 74 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/monitor.go
View File

@@ -787,7 +787,7 @@ type RouteInfo struct {
// Routez returns a Routez struct containing information about routes.
func (s *Server) Routez(routezOpts *RoutezOptions) (*Routez, error) {
rs := &Routez{Routes: []*RouteInfo{}}
rs.Now = time.Now().UTC()
rs.Now = time.Now()
if routezOpts == nil {
routezOpts = &RoutezOptions{}
@@ -980,7 +980,7 @@ func (s *Server) Subsz(opts *SubszOptions) (*Subsz, error) {
slStats := &SublistStats{}
// FIXME(dlc) - Make account aware.
sz := &Subsz{s.info.ID, time.Now().UTC(), slStats, 0, offset, limit, nil}
sz := &Subsz{s.info.ID, time.Now(), slStats, 0, offset, limit, nil}
if subdetail {
var raw [4096]*subscription
@@ -1607,7 +1607,7 @@ func (s *Server) updateVarzConfigReloadableFields(v *Varz) {
v.MaxPending = opts.MaxPending
v.TLSTimeout = opts.TLSTimeout
v.WriteDeadline = opts.WriteDeadline
v.ConfigLoadTime = s.configTime
v.ConfigLoadTime = s.configTime.UTC()
// Update route URLs if applicable
if s.varzUpdateRouteURLs {
v.Cluster.URLs = urlsToStrings(opts.Routes)