upstream/icingadb
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb.git synced 2026-05-28 04:35:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #38 from lippserd/feature/redis-key-prefix

Browse source 
Change redis key prefix to 'icinga:*' instead of 'icinga:config:*'
This commit is contained in:
Eric Lippmann 2021-05-04 09:24:08 +02:00 committed by GitHub
commit 3af683679b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/icingadb/sync.go
View file

@ -48,7 +48,7 @@ func (s Sync) GetDelta(ctx context.Context, factoryFunc contracts.EntityFactoryF
withChecksum = true
redisKey = fmt.Sprintf("icinga:checksum:%s", utils.Key(utils.Name(v), ':'))
} else {
redisKey = fmt.Sprintf("icinga:config:%s", utils.Key(utils.Name(v), ':'))
redisKey = fmt.Sprintf("icinga:%s", utils.Key(utils.Name(v), ':'))
}
desired, err := s.fromRedis(ctx, factoryFunc, redisKey)
@ -64,7 +64,7 @@ func (s Sync) GetDelta(ctx context.Context, factoryFunc contracts.EntityFactoryF
// by factoryFunc using the Sync function.
func (s Sync) SyncAfterDump(ctx context.Context, factoryFunc contracts.EntityFactoryFunc, dump *DumpSignals) error {
typeName := utils.Name(factoryFunc())
key := "icinga:config:" + utils.Key(typeName, ':')
key := "icinga:" + utils.Key(typeName, ':')
startTime := time.Now()
logTicker := time.NewTicker(20 * time.Second)
@ -116,7 +116,7 @@ func (s Sync) Sync(ctx context.Context, factoryFunc contracts.EntityFactoryFunc)
if delta.WithChecksum {
pairs, errs := s.redis.HMYield(
ctx,
fmt.Sprintf("icinga:config:%s", utils.Key(utils.Name(v), ':')),
fmt.Sprintf("icinga:%s", utils.Key(utils.Name(v), ':')),
count,
concurrent,
delta.Create.Keys()...)
@ -143,7 +143,7 @@ func (s Sync) Sync(ctx context.Context, factoryFunc contracts.EntityFactoryFunc)
s.logger.Infof("Updating %d rows of type %s", len(delta.Update), utils.Key(utils.Name(v), ' '))
pairs, errs := s.redis.HMYield(
ctx,
fmt.Sprintf("icinga:config:%s", utils.Key(utils.Name(v), ':')),
fmt.Sprintf("icinga:%s", utils.Key(utils.Name(v), ':')),
count,
concurrent,
delta.Update.Keys()...)