paadi/tecamino-dbm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify websocketserver to broker with callback functions

Browse Source
This commit is contained in:
Adrian Zürcher
2025-06-19 19:22:23 +02:00
parent 9605b50198
commit 659cbe4072
19 changed files with 367 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dbm/dbmHandler.go
View File

@@ -11,13 +11,13 @@ import (
"github.com/tecamino/tecamino-dbm/args"
"github.com/tecamino/tecamino-dbm/models"
serverModels "github.com/tecamino/tecamino-dbm/server/models"
ws "github.com/tecamino/tecamino-dbm/websocket"
"github.com/tecamino/tecamino-logger/logging"
)
type DBMHandler struct {
DBM *models.DBM
Conns *serverModels.Connections
Conns *ws.ClientHandler
sync.RWMutex
Log *logging.Logger
arg *args.Args
@@ -43,7 +43,7 @@ func NewDbmHandler(a *args.Args) (*DBMHandler, error) {
logger.Info("main", "start dma handler")
//initialize connection map
conns := serverModels.NewConnections()
conns := ws.NewConnectionHandler()
// Initialize dtabase manager handler
dmaHandler := DBMHandler{
@@ -74,8 +74,8 @@ func NewDbmHandler(a *args.Args) (*DBMHandler, error) {
var line int
for scanner.Scan() {
line++
dp := models.Datapoint{}
if err = json.Unmarshal(scanner.Bytes(), &dp); err != nil {
dp := &models.Datapoint{}
if err = json.Unmarshal(scanner.Bytes(), dp); err != nil {
dmaHandler.Log.Error("dmbHandler.NewDmbHandler", "error in line "+fmt.Sprint(line)+" "+scanner.Text())
dmaHandler.Log.Error("dmbHandler.NewDmbHandler", err.Error())