3 Commits

Author SHA1 Message Date
Adrian Zuercher
8ca441cc24 add optional endpoint to new client 2025-08-24 21:22:11 +02:00
Adrian Zuercher
567d2fe03d add optional endpoint to new client 2025-08-24 21:18:43 +02:00
Adrian Zuercher
756985882a remove memory and garbage collection infos 2025-08-24 08:33:25 +02:00
4 changed files with 10 additions and 53 deletions

View File

@@ -57,8 +57,11 @@ var upgrader = websocket.Upgrader{
EnableCompression: false,
}
func NewClient(ip, id string, port uint, logger *logging.Logger) (*Client, error) {
u := url.URL{Scheme: "ws", Host: fmt.Sprintf("%s:%d", ip, port), Path: "status", RawQuery: "id=" + id}
func NewClient(id, ip, endpoint string, port uint, logger *logging.Logger) (*Client, error) {
if endpoint == "" {
endpoint = "status"
}
u := url.URL{Scheme: "ws", Host: fmt.Sprintf("%s:%d", ip, port), Path: endpoint, RawQuery: "id=" + id}
c := &Client{
id: id,

View File

@@ -24,7 +24,7 @@ type StatusClient struct {
// serviceName: unique ID/name for this client
// ip, port: target server address
// debug: enable debug logging
func NewStatusClient(serviceName, ip string, port uint, debug bool) (*StatusClient, error) {
func NewStatusClient(serviceName, ip, endpoint string, port uint, debug bool) (*StatusClient, error) {
config := models.Config{Log: logging.Config{Debug: debug}}
config.Default()
@@ -43,7 +43,7 @@ func NewStatusClient(serviceName, ip string, port uint, debug bool) (*StatusClie
}
// connect underlying websocket client
sc.client, err = models.NewClient(ip, serviceName, port, logger)
sc.client, err = models.NewClient(serviceName, ip, endpoint, port, logger)
if err != nil {
return nil, err
}

View File

@@ -1,10 +1,8 @@
package statusServer
import (
"context"
"fmt"
"net/http"
"runtime"
"strings"
"time"
@@ -97,56 +95,12 @@ func NewStatusServer(config models.Config) (*StatusServer, error) {
return s, nil
}
// ServeHttp starts the HTTP server and continuously publishes runtime metrics
// (memory allocation + GC count) to the "info" topic.
//
// ServeHttp starts the HTTP server
// It blocks until the HTTP server stops. Resources are cleaned up on shutdown:
// PubSub is closed and a shutdown message is logged.
func (s *StatusServer) ServeHttp() error {
s.log.Debug("ServeHttp", "start publishing runtime metrics (memory + GC count)")
// create cancellable context for metrics goroutine
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
// metrics publisher goroutine
go func() {
for {
var init bool
var m runtime.MemStats
var oldM uint64
var oldGc uint32
var info struct {
Memory uint64 `json:"memory"`
GC uint32 `json:"gc"`
}
ticker := time.NewTicker(500 * time.Millisecond)
defer ticker.Stop()
for {
select {
case <-ctx.Done():
// stop publishing if context is canceled
return
case <-ticker.C:
// read runtime memory statistics
runtime.ReadMemStats(&m)
info.GC = m.NumGC
// publish only when values changed or first run
if oldGc != m.NumGC || oldM != m.Alloc/1024 || !init {
info.Memory = m.Alloc / 1024
s.pubSub.Publish("info", info)
oldGc = m.NumGC
oldM = m.Alloc / 1024
init = true
}
}
}
}
}()
// log startup
s.log.Info("ServeHttp", fmt.Sprintf("start listening on %s:%d", s.Ip, s.Port))

View File

@@ -35,11 +35,11 @@ func TestConnection(t *testing.T) {
time.Sleep(time.Second)
client1, err := statusServer.NewStatusClient("adrian", "127.0.0.1", 8080, true)
client1, err := statusServer.NewStatusClient("adrian", "127.0.0.1", "", 8080, true)
if err != nil {
t.Fatal(err)
}
client, err := statusServer.NewStatusClient("test", "127.0.0.1", 8080, true)
client, err := statusServer.NewStatusClient("test", "127.0.0.1", "", 8080, true)
if err != nil {
t.Fatal(err)
}