infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-12 17:04:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix message size in a message in gentestdata

Browse Source 
and work around the message in test-upgrade.sh.
and add subcommand to open an account, triggering data upgrades.
This commit is contained in:
Mechiel Lukkien
2023-08-16 14:36:17 +02:00
parent ddf3cb3653
commit 1ccc5d0177
6 changed files with 64 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
store/account.go
View File

@ -677,7 +677,6 @@ func OpenAccount(name string) (*Account, error) {
if err != nil {
return nil, err
}
acc.nused++
openAccounts.names[name] = acc
return acc, nil
}
@ -685,13 +684,20 @@ func OpenAccount(name string) (*Account, error) {
// openAccount opens an existing account, or creates it if it is missing.
func openAccount(name string) (a *Account, rerr error) {
dir := filepath.Join(mox.DataDirPath("accounts"), name)
dbpath := filepath.Join(dir, "index.db")
return OpenAccountDB(dir, name)
}
// OpenAccountDB opens an account database file and returns an initialized account
// or error. Only exported for use by subcommands that verify the database file.
// Almost all account opens must go through OpenAccount/OpenEmail/OpenEmailAuth.
func OpenAccountDB(accountDir, accountName string) (a *Account, rerr error) {
dbpath := filepath.Join(accountDir, "index.db")
// Create account if it doesn't exist yet.
isNew := false
if _, err := os.Stat(dbpath); err != nil && os.IsNotExist(err) {
isNew = true
os.MkdirAll(dir, 0770)
os.MkdirAll(accountDir, 0770)
}
db, err := bstore.Open(context.TODO(), dbpath, &bstore.Options{Timeout: 5 * time.Second, Perm: 0660}, DBTypes...)
@ -719,7 +725,7 @@ func openAccount(name string) (a *Account, rerr error) {
return bstore.QueryTx[Mailbox](tx).FilterEqual("HaveCounts", false).ForEach(func(mb Mailbox) error {
if !mentioned {
mentioned = true
xlog.Info("first calculation of mailbox counts for account", mlog.Field("account", name))
xlog.Info("first calculation of mailbox counts for account", mlog.Field("account", accountName))
}
mc, err := mb.CalculateCounts(tx)
if err != nil {
@ -736,10 +742,11 @@ func openAccount(name string) (a *Account, rerr error) {
}
return &Account{
Name: name,
Dir: dir,
Name: accountName,
Dir: accountDir,
DBPath: dbpath,
DB: db,
nused: 1,
}, nil
}