Skip to content

Commit

Permalink
Revert "backport of commit ebe9ccf (#25624)" (#25687)
Browse files Browse the repository at this point in the history
This reverts commit efeafec.
  • Loading branch information
miagilepner authored Feb 28, 2024
1 parent ee2cd6b commit 0ee38fb
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 8 deletions.
1 change: 0 additions & 1 deletion vault/activity_log.go
Original file line number Diff line number Diff line change
Expand Up @@ -1454,7 +1454,6 @@ func (c *Core) ResetActivityLog() []*activity.LogFragment {

allFragments = append(allFragments, a.standbyFragmentsReceived...)
a.standbyFragmentsReceived = make([]*activity.LogFragment, 0)
a.partialMonthClientTracker = make(map[string]*activity.EntityRecord)
a.fragmentLock.Unlock()
return allFragments
}
Expand Down
5 changes: 0 additions & 5 deletions vault/core.go
Original file line number Diff line number Diff line change
Expand Up @@ -2683,11 +2683,6 @@ func (c *Core) postUnseal(ctx context.Context, ctxCancelFunc context.CancelFunc,
if c.systemBackend != nil && c.systemBackend.mfaBackend != nil {
c.systemBackend.mfaBackend.usedCodes = cache.New(0, 30*time.Second)
}
if c.systemBackend != nil {
// all mounts need to be initialized before activity log reporting
// starts, which happens in the post-unseal functions above.
sysActivityLogReporting(c.systemBackend)
}
c.logger.Info("post-unseal setup complete")
return nil
}
Expand Down
2 changes: 0 additions & 2 deletions vault/logical_system_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ var (
return nil
}

sysActivityLogReporting = func(b *SystemBackend) {}

getSystemSchemas = func() []func() *memdb.TableSchema { return nil }

getEGPListResponseKeyInfo = func(*SystemBackend, *namespace.Namespace) map[string]interface{} { return nil }
Expand Down

0 comments on commit 0ee38fb

Please sign in to comment.