From aad1dc2d28003f4bd871859f5ada6ff0d74be195 Mon Sep 17 00:00:00 2001
From: Felix Riehm <mail@felixriehm.de>
Date: Mon, 11 Mar 2024 16:49:52 +0100
Subject: [PATCH] remove log messages, adjust pop up position, adjust buffer
grouping when world map is active
---
api/service/bloxberg/service.go | 19 -------------------
api/utils/log/logger.go | 18 +++++++++---------
api/world_map/controller.go | 8 +++++---
web/src/canvas/world_map/circle.ts | 2 +-
web/src/service_event/event_buffer.ts | 11 ++++++++---
5 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/api/service/bloxberg/service.go b/api/service/bloxberg/service.go
index 175443c..fced1c6 100644
--- a/api/service/bloxberg/service.go
+++ b/api/service/bloxberg/service.go
@@ -10,7 +10,6 @@ import (
"api/websocket"
"api/world_map"
"encoding/json"
- "fmt"
"time"
)
@@ -163,14 +162,7 @@ func (sc *Service) processEvent() {
// create websocket data for blocks
log.Debug("create websocket data for bloxberg.", log.Bloxberg, log.Service)
var websocketEventData websocket.BloxbergData
- log.Debug(fmt.Sprintf("Inside processing: Location map:"), log.WorldMap)
- for k, v := range sc.WorldMapData {
- log.Debug(fmt.Sprintf("Location map: id: %s, lat: %f,%f", k, v.Coordinate.Lat, v.Coordinate.Long), log.WorldMap)
- }
for _, block := range blocks {
- log.Debug(fmt.Sprintf("Block: Miner hash: %s, Location: %f,%f, Location-map-size: %d",
- block.MinerHash, sc.WorldMapData[block.MinerHash].Coordinate.Lat, sc.WorldMapData[block.MinerHash].Coordinate.Long,
- len(sc.WorldMapData)), log.Bloxberg, log.Service)
websocketEventData.Blocks = append(websocketEventData.Blocks, websocket.BloxbergBlock{
ByteSize: block.ByteSize,
InsertedAt: block.InsertedAt,
@@ -182,13 +174,6 @@ func (sc *Service) processEvent() {
// create websocket data for ConfirmedTransaction
for _, confirmedTransaction := range confirmedTransacttions {
- log.Debug(fmt.Sprintf("Confirmed transaction: Miner hash: %s, Location: %f,%f, Location-map-size: %d",
- confirmedTransaction.BlockMinerHash, sc.WorldMapData[confirmedTransaction.BlockMinerHash].Coordinate.Lat,
- sc.WorldMapData[confirmedTransaction.BlockMinerHash].Coordinate.Long, len(sc.WorldMapData)), log.Bloxberg, log.Service)
- var test = sc.WorldMapData[confirmedTransaction.BlockMinerHash]
- log.Debug(fmt.Sprintf("Test: Miner hash: %s, Location: %f,%f, Location-map-size: %d",
- confirmedTransaction.BlockMinerHash, test.Coordinate.Lat,
- test.Coordinate.Long, len(sc.WorldMapData)), log.Bloxberg, log.Service)
websocketEventData.ConfirmedTransactions = append(websocketEventData.ConfirmedTransactions, websocket.BloxbergConfirmedTransaction{
TransactionFee: confirmedTransaction.TransactionFee,
UpdatedAt: confirmedTransaction.UpdatedAt,
@@ -244,9 +229,5 @@ func (sc *Service) loadWorldMapData() {
mail.SendErrorMail(logMessage, worldMapErr)
} else {
sc.WorldMapData = worldMapData
- log.Debug(fmt.Sprintf("Inside load: Location map:"), log.WorldMap)
- for k, v := range sc.WorldMapData {
- log.Debug(fmt.Sprintf("Location map: id: %s, lat: %f,%f", k, v.Coordinate.Lat, v.Coordinate.Long), log.WorldMap)
- }
}
}
diff --git a/api/utils/log/logger.go b/api/utils/log/logger.go
index dfa36d4..8f2647e 100644
--- a/api/utils/log/logger.go
+++ b/api/utils/log/logger.go
@@ -13,10 +13,10 @@ var (
infoLogger *log.Logger
debugLogger *log.Logger
traceLogger *log.Logger
- logLevel int
+ LogLevel int
)
-func Init(LogAbsolutePath string, LogMaxSize int, LogMaxBackups int, LogMaxAge int, LogCompress bool, LogLevel int,
+func Init(LogAbsolutePath string, LogMaxSize int, LogMaxBackups int, LogMaxAge int, LogCompress bool, LogLevelParameter int,
appEnvironment string) {
// Set up logging
output := &lumberjack.Logger{
@@ -26,7 +26,7 @@ func Init(LogAbsolutePath string, LogMaxSize int, LogMaxBackups int, LogMaxAge i
MaxAge: LogMaxAge, // days
Compress: LogCompress, // compress backed up log files
}
- logLevel = LogLevel
+ LogLevel = LogLevelParameter
fatalLogger = log.New(output, appEnvironment+" [FATAL] ", log.Ldate|log.Ltime)
errorLogger = log.New(output, appEnvironment+" [ERROR] ", log.Ldate|log.Ltime)
@@ -37,37 +37,37 @@ func Init(LogAbsolutePath string, LogMaxSize int, LogMaxBackups int, LogMaxAge i
}
func Fatal(msg string, err error, concerns ...Concern) {
- if logLevel >= 1 {
+ if LogLevel >= 1 {
fatalLogger.Fatalln(concernsToString(concerns...), msgToString(msg, err))
}
}
func Error(msg string, err error, concerns ...Concern) {
- if logLevel >= 2 {
+ if LogLevel >= 2 {
errorLogger.Println(concernsToString(concerns...), msgToString(msg, err))
}
}
func Warn(msg string, concerns ...Concern) {
- if logLevel >= 3 {
+ if LogLevel >= 3 {
warningLogger.Println(concernsToString(concerns...), msgToString(msg, nil))
}
}
func Info(msg string, concerns ...Concern) {
- if logLevel >= 4 {
+ if LogLevel >= 4 {
infoLogger.Println(concernsToString(concerns...), msgToString(msg, nil))
}
}
func Debug(msg string, concerns ...Concern) {
- if logLevel >= 5 {
+ if LogLevel >= 5 {
debugLogger.Println(concernsToString(concerns...), msgToString(msg, nil))
}
}
func Trace(msg string, concerns ...Concern) {
- if logLevel >= 6 {
+ if LogLevel >= 6 {
traceLogger.Println(concernsToString(concerns...), msgToString(msg, nil))
}
}
diff --git a/api/world_map/controller.go b/api/world_map/controller.go
index daebf41..6af1dfa 100644
--- a/api/world_map/controller.go
+++ b/api/world_map/controller.go
@@ -46,9 +46,11 @@ func (idc *Controller) Load() (worldMapDataMap map[string]Location, e error) {
}
}
- log.Debug(fmt.Sprintf("Location map:"), log.WorldMap)
- for k, v := range worldMapDataMap {
- log.Debug(fmt.Sprintf("Location map: id: %s, lat: %f,%f", k, v.Coordinate.Lat, v.Coordinate.Long), log.WorldMap)
+ if log.LogLevel >= 5 {
+ log.Debug(fmt.Sprintf("Location map:"), log.WorldMap)
+ for k, v := range worldMapDataMap {
+ log.Debug(fmt.Sprintf("id: %s, lat,long: %f,%f", k, v.Coordinate.Lat, v.Coordinate.Long), log.WorldMap)
+ }
}
return
diff --git a/web/src/canvas/world_map/circle.ts b/web/src/canvas/world_map/circle.ts
index 742fd80..19920b5 100644
--- a/web/src/canvas/world_map/circle.ts
+++ b/web/src/canvas/world_map/circle.ts
@@ -56,7 +56,7 @@ export class Circle{
const popUpContainer = this.circlesLayer.canvas.appContainer.append("div");
popUpContainer
.style('position', 'absolute')
- .style('top', `${y + 10}px`)
+ .style('top', `${y - this.circlesLayer.canvas.theme.header_height + 10}px`)
.style('left', `${x + 10}px`)
.style('padding', '4px')
.style('border-radius', '1px')
diff --git a/web/src/service_event/event_buffer.ts b/web/src/service_event/event_buffer.ts
index 2ea9d4e..9560497 100644
--- a/web/src/service_event/event_buffer.ts
+++ b/web/src/service_event/event_buffer.ts
@@ -4,11 +4,13 @@ import {getRandomIntInclusive} from "../util/random";
export class EventBuffer {
private readonly eventBuffer: Map<ServiceEvent, EventBufferData>;
+ private readonly hatnote_map: boolean;
constructor(default_event_buffer_timespan: number, publishCircleEvent: (circleEvent: DelayedCircleEvent[]) => void, hatnote_map: boolean) {
+ this.hatnote_map = hatnote_map;
this.eventBuffer = new Map([
[ServiceEvent.bloxberg_block, new EventBufferData(publishCircleEvent, hatnote_map, default_event_buffer_timespan)],
- [ServiceEvent.bloxberg_confirmed_transaction, new EventBufferData(publishCircleEvent, hatnote_map, default_event_buffer_timespan, 1200)],
+ [ServiceEvent.bloxberg_confirmed_transaction, new EventBufferData(publishCircleEvent, hatnote_map, default_event_buffer_timespan, hatnote_map ? 1000 : 1200)],
[ServiceEvent.keeper_file_create, new EventBufferData(publishCircleEvent, hatnote_map, 1000,1000)], // Keeper only returns time precision of seconds
[ServiceEvent.keeper_file_edit, new EventBufferData(publishCircleEvent, hatnote_map, 1000,1000)], // Keeper only returns time precision of seconds
[ServiceEvent.keeper_new_library, new EventBufferData(publishCircleEvent, hatnote_map, 1000,1000)], // Keeper only returns time precision of seconds
@@ -30,6 +32,7 @@ export class EventBuffer {
return
if(eventBufferData.isEventCirclesArrayEmpty()){
+ let that = this;
setTimeout(function(){
switch (circleEvent) {
case ServiceEvent.keeper_file_create:
@@ -38,8 +41,10 @@ export class EventBuffer {
eventBufferData?.splitBufferAndRelease(splitRandom)
break;
case ServiceEvent.bloxberg_confirmed_transaction:
- let splitRandomBloxberg = 3
- eventBufferData?.splitBufferAndRelease(splitRandomBloxberg)
+ if (!that.hatnote_map) {
+ let splitRandomBloxberg = 3
+ eventBufferData?.splitBufferAndRelease(splitRandomBloxberg)
+ }
break;
default:
eventBufferData?.releaseBuffer()
--
GitLab