malhuda/alice-lg
1
0
Fork 0
Code Issues 39 Pull Requests 11 Actions Packages Projects Releases 2 Wiki Activity

Harmonize neighbors and route store logging

Browse Source
This commit is contained in:
Johannes Moos 2024-02-24 12:51:51 +01:00
parent 914c7a4491
commit 304b44675b
No known key found for this signature in database
GPG Key ID: F21CEC07F73E3294
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/store/neighbors_store.go
View File

@ -150,7 +150,7 @@ func (s *NeighborsStore) safeUpdateSource(ctx context.Context, id string) {
}
if err := s.sources.LockSource(id); err != nil {
log.Println("Cloud not start neighbor refresh:", err)
log.Println("[neighbors store] could not start neighbor refresh:", err)
return
}
@ -165,15 +165,15 @@ func (s *NeighborsStore) safeUpdateSource(ctx context.Context, id string) {
defer func() {
if err := recover(); err != nil {
log.Println(
"Recovering after failed neighbors refresh of",
srcName, "from:", err)
"[neighbors store] recovering after failed neighbors refresh from",
srcName, "with error:", err)
s.sources.RefreshError(id, err)
}
}()
if err := s.updateSource(ctx, src, id); err != nil {
log.Println(
"Refreshing neighbors of", srcName, "failed:", err)
"[neighbors store] refreshing neighbors from", srcName, "failed:", err)
s.sources.RefreshError(id, err)
}
@ -181,7 +181,7 @@ func (s *NeighborsStore) safeUpdateSource(ctx context.Context, id string) {
if err != nil {
log.Println(err)
} else {
log.Println("Refreshed neighbors of", srcName, "in", status.LastRefreshDuration)
log.Println("[neighbors store] refreshed neighbors from", srcName, "in", status.LastRefreshDuration)
}
}
@ -332,7 +332,7 @@ func (s *NeighborsStore) Stats(
ncount, err := s.backend.CountNeighborsAt(ctx, sourceID)
if err != nil {
if !errors.Is(err, sources.ErrSourceNotFound) {
log.Println("error during neighbor count:", err)
log.Println("[neighbors store] error during neighbor count:", err)
}
}
totalNeighbors += ncount
@ -381,7 +381,7 @@ func (s *NeighborsStore) Status(ctx context.Context) *api.StoreStatus {
func (s *NeighborsStore) SourceCachedAt(sourceID string) time.Time {
status, err := s.sources.GetStatus(sourceID)
if err != nil {
log.Println("error while getting source cached at:", err)
log.Println("[neighbors store] error while getting source cached at:", err)
return time.Time{}
}
return status.LastRefresh

24
pkg/store/routes_store.go
View File

@ -142,7 +142,7 @@ func (s *RoutesStore) safeUpdateSource(ctx context.Context, id string) {
}
if err := s.sources.LockSource(id); err != nil {
log.Println("Cloud not start routes refresh:", err)
log.Println("[routes store] could not start routes refresh:", err)
return
}
@ -153,28 +153,28 @@ func (s *RoutesStore) safeUpdateSource(ctx context.Context, id string) {
src := s.sources.Get(id)
srcName := s.sources.GetName(id)
log.Println("[routes store] begin routes refresh of:", srcName)
log.Println("[routes store] begin routes refresh from", srcName)
// Prepare for impact.
defer func() {
if err := recover(); err != nil {
log.Println(
"Recovering after failed routes refresh of",
src.Name, "from:", err)
"[routes store] recovering after failed routes refresh from",
src.Name, "with error:", err)
s.sources.RefreshError(id, err)
}
}()
if err := s.updateSource(ctx, src); err != nil {
log.Println(
"Refreshing routes of", src.Name, "failed:", err)
"[routes store] refreshing routes from", src.Name, "failed:", err)
s.sources.RefreshError(id, err)
} else {
status, err := s.sources.GetStatus(id)
if err != nil {
log.Println(err)
} else {
log.Println("Refreshed routes of", srcName, "in", status.LastRefreshDuration)
log.Println("[routes store] refreshed routes from", srcName, "in", status.LastRefreshDuration)
}
}
}
@ -194,7 +194,7 @@ func (s *RoutesStore) updateSource(
return err
}
log.Println("[routes store] finished fetching routes dump from RS", src.Name)
log.Println("[routes store] finished fetching routes dump from", src.Name)
neighbors, err := s.neighbors.GetNeighborsMapAt(ctx, src.ID)
if err != nil {
@ -203,7 +203,7 @@ func (s *RoutesStore) updateSource(
log.Println(
"[routes store] retrieved", len(res.Imported),
"accepted and", len(res.Filtered), "filtered routes for:", src.Name)
"accepted and", len(res.Filtered), "filtered routes from", src.Name)
// Prepare imported routes for lookup
srcRS := &api.LookupRouteServer{
@ -214,11 +214,11 @@ func (s *RoutesStore) updateSource(
filtered := res.Filtered.ToLookupRoutes("filtered", srcRS, neighbors)
lookupRoutes := append(imported, filtered...)
log.Println("[routes store] importing", len(lookupRoutes), "into store from", src.Name)
log.Println("[routes store] importing", len(lookupRoutes), "routes into store from", src.Name)
if err = s.backend.SetRoutes(ctx, src.ID, lookupRoutes); err != nil {
return err
}
log.Println("[routes store] import success")
log.Println("[routes store] successfully imported", len(lookupRoutes), "routes into store from", src.Name)
return s.sources.RefreshSuccess(src.ID)
}
@ -277,7 +277,7 @@ func (s *RoutesStore) Stats(ctx context.Context) *api.RoutesStoreStats {
for _, sourceID := range s.sources.GetSourceIDs() {
status, err := s.sources.GetStatus(sourceID)
if err != nil {
log.Println("error while getting source status:", err)
log.Println("[routes store] error while getting source status:", err)
continue
}
@ -285,7 +285,7 @@ func (s *RoutesStore) Stats(ctx context.Context) *api.RoutesStoreStats {
nImported, nFiltered, err := s.backend.CountRoutesAt(ctx, sourceID)
if err != nil {
if !errors.Is(err, sources.ErrSourceNotFound) {
log.Println("error during routes count:", err)
log.Println("[routes store] error during routes count:", err)
}
}