diff --git a/backup/backup.go b/backup/backup.go index 702b2b9c5ef10bb344b49eb5f8bf2835c31f00f4..0fa796e5e43503f4a90108e173ffea39fab262f4 100644 --- a/backup/backup.go +++ b/backup/backup.go @@ -150,7 +150,7 @@ func resumeBackup(updateBackupCb UpdateBackupFn, c *api.Client, // Setting backup trigger in client b.backupContainer.SetBackup(b.TriggerBackup) - jww.INFO.Print("Resumed backup with password loaded from storage.") + jww.INFO.Print("resumed backup with password loaded from storage.") return b, nil } @@ -308,9 +308,14 @@ func (b *Backup) assembleBackup() backup.Backup { // not yet noticed by user OR explicitly rejected. bu.Contacts.Identities = append(bu.Contacts.Identities, b.store.Auth().GetAllSentIDs()...) + jww.INFO.Printf("backup saw %d contacts", len(bu.Contacts.Identities)) + jww.DEBUG.Printf("contacts in backup list: %+v", bu.Contacts.Identities) //deduplicate list bu.Contacts.Identities = deduplicate(bu.Contacts.Identities) + jww.INFO.Printf("backup saved %d contacts after deduplication", + len(bu.Contacts.Identities)) + //add the memoized json params bu.JSONParams = b.jsonParams diff --git a/xxmutils/restoreContacts.go b/xxmutils/restoreContacts.go index f507af8ae1b8491f364f8e50318d557539086269..5074508c6d70f21057a0dffe3300035f66162b26 100644 --- a/xxmutils/restoreContacts.go +++ b/xxmutils/restoreContacts.go @@ -69,6 +69,9 @@ func RestoreContactsFromBackup(backupPartnerIDs []byte, client *api.Client, } lookupIDs, resetContacts, restored := checkRestoreState(idList, store) + jww.INFO.Printf("restoring %d backup partner IDs", len(lookupIDs)) + jww.DEBUG.Printf("backup partner IDs to restore: %+v", lookupIDs) + // State variables, how many we have looked up successfully // and how many we have already reset. totalCnt := len(idList)