From 26539d184e09c4f282871768b153827ec9c32df2 Mon Sep 17 00:00:00 2001 From: Ulf Bjorkengren Date: Mon, 25 Nov 2024 11:35:37 +0100 Subject: [PATCH] WSmgr cleanup Signed-off-by: Ulf Bjorkengren --- client/client-1.0/Javascript/wsclient.html | 4 ++-- server/vissv2server/serviceMgr/serviceMgr.go | 5 ++++- server/vissv2server/vissv2server.go | 2 +- utils/common.go | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/client/client-1.0/Javascript/wsclient.html b/client/client-1.0/Javascript/wsclient.html index 42cc2d6a..976722df 100644 --- a/client/client-1.0/Javascript/wsclient.html +++ b/client/client-1.0/Javascript/wsclient.html @@ -13,7 +13,7 @@ -

Websocket client example, uncompressed messages

+

Websocket client example, unencoded messages

@@ -52,7 +52,7 @@

Websocket client example, uncompressed messages

try { function setHostIP() { hostIP = externHostIp.value; - socket = new WebSocket("ws://" + hostIP + ":8080", "VISSv2"); + socket = new WebSocket("ws://" + hostIP + ":8080", "VISS-noenc"); socket.onopen = function () { output.innerHTML += "Status: Connected\n"; diff --git a/server/vissv2server/serviceMgr/serviceMgr.go b/server/vissv2server/serviceMgr/serviceMgr.go index 3fd67521..af473d50 100644 --- a/server/vissv2server/serviceMgr/serviceMgr.go +++ b/server/vissv2server/serviceMgr/serviceMgr.go @@ -1006,14 +1006,17 @@ func configureDefault(udsConn net.Conn) { func feederFrontend(toFeeder chan string, fromFeederRorC chan string, fromFeederCl chan string) { var udsConn net.Conn attempts := 0 + utils.Info.Printf("feederFrontend:Trying to connect to feeder...") for udsConn == nil && attempts < 10 { udsConn = utils.GetUdsConn("*", "serverFeeder") if udsConn == nil && attempts >= 10-1 { utils.Error.Printf("feederFrontend:Failed to UDS connect to feeder.") return // ??? } + attempts++ time.Sleep(3 * time.Second) } + utils.Info.Printf("feederFrontend:Connected to feeder.") configureDefault(udsConn) fromFeeder := make(chan string) go feederReader(udsConn, fromFeeder) @@ -1474,7 +1477,7 @@ func ServiceMgrInit(mgrId int, serviceMgrChan chan string, stateStorageType stri _, subscriptionList = scanAndRemoveListItem(subscriptionList, routerId) } default: - utils.SetErrorResponse(requestMap, errorResponseMap, 1, "") //invalid_data + utils.SetErrorResponse(requestMap, errorResponseMap, 1, "Unknown action") //invalid_data dataChan <- utils.FinalizeMessage(errorResponseMap) } // switch case <-dummyTicker.C: diff --git a/server/vissv2server/vissv2server.go b/server/vissv2server/vissv2server.go index c8c2e279..552423b6 100644 --- a/server/vissv2server/vissv2server.go +++ b/server/vissv2server/vissv2server.go @@ -638,7 +638,7 @@ func issueServiceRequest(requestMap map[string]interface{}, tDChanIndex int, sDC return } if requestMap["action"] == "set" && nodeType != utils.ACTUATOR { - utils.SetErrorResponse(requestMap, errorResponseMap, 1, "") //invalid_data + utils.SetErrorResponse(requestMap, errorResponseMap, 1, "Forbidden to write to read-only resource.") //invalid_data backendChan[tDChanIndex] <- utils.FinalizeMessage(errorResponseMap) return } diff --git a/utils/common.go b/utils/common.go index 38d26361..60cbb275 100644 --- a/utils/common.go +++ b/utils/common.go @@ -113,7 +113,7 @@ func getSocketPath(listIndex int, connectionName string) string { func connectViaUds(sockFile string) net.Conn { udsConn, err := net.Dial("unix", sockFile) if err != nil { - Error.Printf("connectViaUds:UDS Dial failed, err = %s", err) +// Error.Printf("connectViaUds:UDS Dial failed, err = %s", err) return nil } return udsConn