Ver código fonte

chore: remove unecessary logs

master
Blaz Smehov 1 mês atrás
pai
commit
dd07081da2
13 arquivos alterados com 22 adições e 34 exclusões
  1. BIN
      bridge
  2. BIN
      decoder
  3. +0
    -2
      internal/app/server/events.go
  4. +2
    -3
      internal/pkg/apiclient/auth.go
  5. +0
    -8
      internal/pkg/apiclient/data.go
  6. +1
    -3
      internal/pkg/apiclient/updatedb.go
  7. +0
    -1
      internal/pkg/apiclient/utils.go
  8. +1
    -2
      internal/pkg/bridge/handler.go
  9. +0
    -6
      internal/pkg/common/utils/beacons.go
  10. BIN
      location
  11. +9
    -0
      scripts/api/tracks.sh
  12. +9
    -9
      scripts/build/build.sh
  13. BIN
      server

BIN
bridge Ver arquivo


BIN
decoder Ver arquivo


+ 0
- 2
internal/app/server/events.go Ver arquivo

@@ -3,7 +3,6 @@ package server
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"fmt"
"log/slog" "log/slog"
"time" "time"


@@ -57,7 +56,6 @@ func RunEventLoop(ctx context.Context, a *ServerApp) {
continue continue
} }
if msg.Type == "Eddystone" && msg.Battery < 3000 { if msg.Type == "Eddystone" && msg.Battery < 3000 {
fmt.Printf("Sending alert for battery low: %+v\n", msg)
service.SendAlert(id, "BatteryLow", a.KafkaManager.GetWriter("alert"), ctx, a.DB) service.SendAlert(id, "BatteryLow", a.KafkaManager.GetWriter("alert"), ctx, a.DB)
} }
case <-beaconTicker.C: case <-beaconTicker.C:


+ 2
- 3
internal/pkg/apiclient/auth.go Ver arquivo

@@ -26,7 +26,6 @@ func GetToken(ctx context.Context, cfg *config.Config, client *http.Client) (str


req, err := http.NewRequest("POST", fmt.Sprintf("%s/realms/API.Server.local/protocol/openid-connect/token", cfg.APIAuthURL), strings.NewReader(formData.Encode())) req, err := http.NewRequest("POST", fmt.Sprintf("%s/realms/API.Server.local/protocol/openid-connect/token", cfg.APIAuthURL), strings.NewReader(formData.Encode()))
if err != nil { if err != nil {
fmt.Println("error", err)
return "", err return "", err
} }
req.Header.Add("Content-Type", "application/x-www-form-urlencoded") req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
@@ -34,16 +33,16 @@ func GetToken(ctx context.Context, cfg *config.Config, client *http.Client) (str
req = req.WithContext(ctx) req = req.WithContext(ctx)
res, err := client.Do(req) res, err := client.Do(req)
if err != nil { if err != nil {
fmt.Println("error", err)
return "", err return "", err
} }


var j response var j response


if err := json.NewDecoder(res.Body).Decode(&j); err != nil { if err := json.NewDecoder(res.Body).Decode(&j); err != nil {
fmt.Println("error", err)
return "", err return "", err
} }


fmt.Printf("token: %s\n", j.Token)

return j.Token, nil return j.Token, nil
} }

+ 0
- 8
internal/pkg/apiclient/data.go Ver arquivo

@@ -12,14 +12,12 @@ import (
func GetTrackers(token string, client *http.Client, cfg *config.Config) ([]model.Tracker, error) { func GetTrackers(token string, client *http.Client, cfg *config.Config) ([]model.Tracker, error) {
res, err := getRequest(token, "getTrackers", client, cfg) res, err := getRequest(token, "getTrackers", client, cfg)
if err != nil { if err != nil {
fmt.Printf("error get trackers: %+v\n", err)
return []model.Tracker{}, err return []model.Tracker{}, err
} }


var i []model.Tracker var i []model.Tracker
err = json.NewDecoder(res.Body).Decode(&i) err = json.NewDecoder(res.Body).Decode(&i)
if err != nil { if err != nil {
fmt.Printf("error decode trackers: %+v\n", err)
return []model.Tracker{}, err return []model.Tracker{}, err
} }


@@ -29,7 +27,6 @@ func GetTrackers(token string, client *http.Client, cfg *config.Config) ([]model
func GetGateways(token string, client *http.Client, cfg *config.Config) ([]model.Gateway, error) { func GetGateways(token string, client *http.Client, cfg *config.Config) ([]model.Gateway, error) {
res, err := getRequest(token, "getGateways", client, cfg) res, err := getRequest(token, "getGateways", client, cfg)
if err != nil { if err != nil {
fmt.Printf("error get gateways: %+v\n", err)
return []model.Gateway{}, err return []model.Gateway{}, err
} }


@@ -76,7 +73,6 @@ func InferPosition(token string, client *http.Client, cfg *config.Config) (model
url := fmt.Sprintf("%s/ble-ai/infer", cfg.APIBaseURL) url := fmt.Sprintf("%s/ble-ai/infer", cfg.APIBaseURL)
req, err := http.NewRequest("GET", url, nil) req, err := http.NewRequest("GET", url, nil)
if err != nil { if err != nil {
fmt.Printf("error new request: %+v\n", err)
return model.PositionResponse{}, err return model.PositionResponse{}, err
} }


@@ -84,20 +80,16 @@ func InferPosition(token string, client *http.Client, cfg *config.Config) (model


res, err := client.Do(req) res, err := client.Do(req)
if err != nil { if err != nil {
fmt.Printf("error do request: %+v\n", err)
return model.PositionResponse{}, err return model.PositionResponse{}, err
} }


fmt.Printf("res.status: %s\n", res.Status)
if res.StatusCode != 200 { if res.StatusCode != 200 {
fmt.Printf("error status code: %d\n", res.StatusCode)
return model.PositionResponse{}, fmt.Errorf("status code: %d", res.StatusCode) return model.PositionResponse{}, fmt.Errorf("status code: %d", res.StatusCode)
} }


var i model.PositionResponse var i model.PositionResponse
err = json.NewDecoder(res.Body).Decode(&i) err = json.NewDecoder(res.Body).Decode(&i)
if err != nil { if err != nil {
fmt.Printf("error decode response: %+v\n", err)
return model.PositionResponse{}, err return model.PositionResponse{}, err
} }




+ 1
- 3
internal/pkg/apiclient/updatedb.go Ver arquivo

@@ -31,8 +31,7 @@ func UpdateDB(db *gorm.DB, ctx context.Context, cfg *config.Config, writer *kafk
if trackers, err := GetTrackers(token, client, cfg); err == nil { if trackers, err := GetTrackers(token, client, cfg); err == nil {
syncTable(db, trackers) syncTable(db, trackers)
if err := controller.SendKafkaMessage(writer, &model.ApiUpdate{Method: "DELETE", MAC: "all"}, ctx); err != nil { if err := controller.SendKafkaMessage(writer, &model.ApiUpdate{Method: "DELETE", MAC: "all"}, ctx); err != nil {
msg := fmt.Sprintf("Error in sending delete all from lookup message: %v", err)
slog.Error(msg)
slog.Error("Error in sending delete all from lookup message", "error", err)
} }


for _, v := range trackers { for _, v := range trackers {
@@ -64,7 +63,6 @@ func UpdateDB(db *gorm.DB, ctx context.Context, cfg *config.Config, writer *kafk
if inferredPosition, err := InferPosition(token, client, cfg); err == nil { if inferredPosition, err := InferPosition(token, client, cfg); err == nil {
for _, v := range inferredPosition.Items { for _, v := range inferredPosition.Items {
mac := convertMac(v.Mac) mac := convertMac(v.Mac)
fmt.Println(mac)
db.Model(&model.Tracker{}).Where("mac = ?", mac).Update("x", v.X).Update("y", v.Y) db.Model(&model.Tracker{}).Where("mac = ?", mac).Update("x", v.X).Update("y", v.Y)
} }
} }


+ 0
- 1
internal/pkg/apiclient/utils.go Ver arquivo

@@ -14,7 +14,6 @@ func setHeader(req *http.Request, token string) {


func getRequest(token, route string, client *http.Client, cfg *config.Config) (*http.Response, error) { func getRequest(token, route string, client *http.Client, cfg *config.Config) (*http.Response, error) {
url := fmt.Sprintf("%s/reslevis/%s", cfg.APIBaseURL, route) url := fmt.Sprintf("%s/reslevis/%s", cfg.APIBaseURL, route)
fmt.Printf("url: %s\n", url)
req, err := http.NewRequest("GET", url, nil) req, err := http.NewRequest("GET", url, nil)
if err != nil { if err != nil {
return nil, err return nil, err


+ 1
- 2
internal/pkg/bridge/handler.go Ver arquivo

@@ -3,7 +3,6 @@ package bridge
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"fmt"
"log/slog" "log/slog"
"strings" "strings"
"time" "time"
@@ -60,7 +59,7 @@ func HandleMQTTMessage(topic string, payload []byte, appState *appcontext.AppSta
} }
return return
} else { } else {
fmt.Println("CSV message: ", msgStr)
slog.Debug("CSV message received", "topic", topic, "message", msgStr)
} }
// CSV format: validate minimum fields (e.g. 6 columns); full parsing can be added later // CSV format: validate minimum fields (e.g. 6 columns); full parsing can be added later
s := strings.Split(msgStr, ",") s := strings.Split(msgStr, ",")


+ 0
- 6
internal/pkg/common/utils/beacons.go Ver arquivo

@@ -1,8 +1,6 @@
package utils package utils


import ( import (
"fmt"

"github.com/AFASystems/presence/internal/pkg/common/appcontext" "github.com/AFASystems/presence/internal/pkg/common/appcontext"
"github.com/AFASystems/presence/internal/pkg/model" "github.com/AFASystems/presence/internal/pkg/model"
) )
@@ -45,14 +43,11 @@ func LoopADStructures(b []byte, i [][2]int, id string, parserRegistry *model.Par
for _, r := range i { for _, r := range i {
ad := b[r[0]:r[1]] ad := b[r[0]:r[1]]
if !isValidADStructure(ad) { if !isValidADStructure(ad) {
fmt.Println("invalid ad structure: ", beacon)
break break
} }
for name, parser := range parserRegistry.ParserList { for name, parser := range parserRegistry.ParserList {
if parser.CanParse(ad) { if parser.CanParse(ad) {
event, ok := parser.Parse(name, ad) event, ok := parser.Parse(name, ad)
fmt.Println("beacon id: ", id)
fmt.Println("parser can parse: ", name)
if ok { if ok {
event.ID = id event.ID = id
event.Name = id event.Name = id
@@ -60,7 +55,6 @@ func LoopADStructures(b []byte, i [][2]int, id string, parserRegistry *model.Par
} }
} }
} }
// fmt.Println("no parser can parse: ", beacon)
} }


return be return be


BIN
location Ver arquivo


+ 9
- 0
scripts/api/tracks.sh Ver arquivo

@@ -31,3 +31,12 @@ echo "==================================="
echo "Query Parameters: limit, from (RFC3339), to (RFC3339)" echo "Query Parameters: limit, from (RFC3339), to (RFC3339)"
echo "Get tracker UUIDs from: GET /reslevis/getTrackers" echo "Get tracker UUIDs from: GET /reslevis/getTrackers"
echo "===================================" echo "==================================="

echo "4. Get all latest positions for all trackers:"
curl -s -X GET "${BASE_URL}/reslevis/getTracks" | jq '.'
echo -e "\n"

echo "==================================="
echo "Query Parameters: limit, from (RFC3339), to (RFC3339)"
echo "Get tracker UUIDs from: GET /reslevis/getTrackers"
echo "==================================="

+ 9
- 9
scripts/build/build.sh Ver arquivo

@@ -1,20 +1,20 @@
#!/bin/bash #!/bin/bash


# Build the server # Build the server
docker build -t afasystemadmin/ble-ai-localizer:server_v1.1 -f ../../build/package/Dockerfile.server ../../
¸
docker build -t afasystemadmin/ble-ai-localizer:server_v1.2 -f ../../build/package/Dockerfile.server ../../
# Build the location # Build the location
docker build -t afasystemadmin/ble-ai-localizer:location_v1.1 -f ../../build/package/Dockerfile.location ../../
docker build -t afasystemadmin/ble-ai-localizer:location_v1.2 -f ../../build/package/Dockerfile.location ../../


# Build the decoder # Build the decoder
docker build -t afasystemadmin/ble-ai-localizer:decoder_v1.1 -f ../../build/package/Dockerfile.decoder ../../
docker build -t afasystemadmin/ble-ai-localizer:decoder_v1.2 -f ../../build/package/Dockerfile.decoder ../../


# Build the bridge # Build the bridge
docker build -t afasystemadmin/ble-ai-localizer:bridge_v1.1 -f ../../build/package/Dockerfile.bridge ../../
docker build -t afasystemadmin/ble-ai-localizer:bridge_v1.2 -f ../../build/package/Dockerfile.bridge ../../


docker image ls docker image ls


docker push afasystemadmin/ble-ai-localizer:server_v1.1
docker push afasystemadmin/ble-ai-localizer:location_v1.1
docker push afasystemadmin/ble-ai-localizer:decoder_v1.1
docker push afasystemadmin/ble-ai-localizer:bridge_v1.1
docker push afasystemadmin/ble-ai-localizer:server_v1.2
docker push afasystemadmin/ble-ai-localizer:location_v1.2
docker push afasystemadmin/ble-ai-localizer:decoder_v1.2
docker push afasystemadmin/ble-ai-localizer:bridge_v1.2

BIN
server Ver arquivo


Carregando…
Cancelar
Salvar