3
0

Updated node service on shared module

This commit is contained in:
Peter Grlica 2020-11-13 10:17:57 +01:00
parent 726a9f16e8
commit df5e2ca89d
3 changed files with 7 additions and 6 deletions

View File

@ -27,6 +27,7 @@ type (
func SharedModule() SharedModuleService {
return &sharedModule{
node: *DefaultNode,
compose: composeService.DefaultModule,
store: DefaultStore,
actionlog: DefaultActionlog,

View File

@ -63,7 +63,7 @@ func (w *syncWorkerStructure) PrepareForNodes(ctx context.Context, urls chan Url
lastSync, _ := w.syncService.GetLastSyncTime(ctx, n.ID, types.NodeSyncTypeStructure)
basePath := fmt.Sprintf("/federation/nodes/%d/modules/exposed/", n.SharedNodeID)
z := []zap.Field{zap.Uint64("nodeID", n.ID)}
z := []zap.Field{zap.Uint64("nodeID", n.ID), zap.String("host", n.BaseURL)}
if lastSync != nil {
z = append(z, zap.Time("lastSync", *lastSync))
@ -167,14 +167,11 @@ func (w *syncWorkerStructure) Watch(ctx context.Context, delay time.Duration, li
countProcess += processed
if err != nil {
spew.Dump("ERR", err)
// handle error
w.logger.Info("error on handling payload", zap.Error(err))
} else {
n, err := DefaultNode.FindBySharedNodeID(ctx, p.Meta.(*structureProcesser).SharedNodeID)
if err != nil {
spew.Dump("ERR", err)
w.logger.Info("could not update sync status", zap.Error(err))
continue
}
@ -190,11 +187,10 @@ func (w *syncWorkerStructure) Watch(ctx context.Context, delay time.Duration, li
new, err = DefaultNodeSync.Create(ctx, new)
if err != nil {
spew.Dump("ERR", err)
w.logger.Info("could not update sync status", zap.Error(err))
}
w.logger.Info("processed objects", zap.Int("processed", processed), zap.Uint64("nodeID", n.ID))
w.logger.Info("processed objects", zap.Int("processed", processed), zap.Uint64("nodeID", n.ID), zap.String("host", n.BaseURL))
}
}
}

View File

@ -24,6 +24,10 @@ func (s Store) convertFederationSharedModuleFilter(f types.SharedModuleFilter) (
query = query.Where("cmd.name = ?", f.Name)
}
if f.ExternalFederationModuleID > 0 {
query = query.Where("cmd.xref_module = ?", f.ExternalFederationModuleID)
}
if f.Query != "" {
q := "%" + strings.ToLower(f.Query) + "%"
query = query.Where(squirrel.Or{