Finalize profile merging, add profile metadata state handling, re-attribute connections after profile deletion
This commit is contained in:
@@ -16,6 +16,7 @@ import (
|
||||
// core:profiles/<scope>/<id>
|
||||
// cache:profiles/index/<identifier>/<value>
|
||||
|
||||
// ProfilesDBPath is the base database path for profiles.
|
||||
const ProfilesDBPath = "core:profiles/"
|
||||
|
||||
var profileDB = database.NewInterface(&database.Options{
|
||||
@@ -59,8 +60,14 @@ func startProfileUpdateChecker() error {
|
||||
}
|
||||
|
||||
// Get active profile.
|
||||
activeProfile := getActiveProfile(strings.TrimPrefix(r.Key(), ProfilesDBPath))
|
||||
scopedID := strings.TrimPrefix(r.Key(), ProfilesDBPath)
|
||||
activeProfile := getActiveProfile(scopedID)
|
||||
if activeProfile == nil {
|
||||
// Check if profile is being deleted.
|
||||
if r.Meta().IsDeleted() {
|
||||
meta.MarkDeleted(scopedID)
|
||||
}
|
||||
|
||||
// Don't do any additional actions if the profile is not active.
|
||||
continue profileFeed
|
||||
}
|
||||
@@ -74,7 +81,9 @@ func startProfileUpdateChecker() error {
|
||||
// Always mark as outdated if the record is being deleted.
|
||||
if r.Meta().IsDeleted() {
|
||||
activeProfile.outdated.Set()
|
||||
module.TriggerEvent(profileConfigChange, nil)
|
||||
|
||||
meta.MarkDeleted(scopedID)
|
||||
module.TriggerEvent(DeletedEvent, scopedID)
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -83,7 +92,7 @@ func startProfileUpdateChecker() error {
|
||||
receivedProfile, err := EnsureProfile(r)
|
||||
if err != nil || !receivedProfile.savedInternally {
|
||||
activeProfile.outdated.Set()
|
||||
module.TriggerEvent(profileConfigChange, nil)
|
||||
module.TriggerEvent(ConfigChangeEvent, scopedID)
|
||||
}
|
||||
case <-ctx.Done():
|
||||
return nil
|
||||
@@ -105,6 +114,11 @@ func (h *databaseHook) UsesPrePut() bool {
|
||||
|
||||
// PrePut implements the Hook interface.
|
||||
func (h *databaseHook) PrePut(r record.Record) (record.Record, error) {
|
||||
// Do not intervene with metadata key.
|
||||
if r.Key() == profilesMetadataKey {
|
||||
return r, nil
|
||||
}
|
||||
|
||||
// convert
|
||||
profile, err := EnsureProfile(r)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user