Other: Remove unused SyncBuffers setting

This commit is contained in:
Leander Beernaert
2022-11-22 13:59:06 +01:00
parent a2ab5df7ce
commit 0df4f41269
9 changed files with 3 additions and 27 deletions

View File

@ -228,10 +228,6 @@ func migratePrefsToVault(vault *vault.Vault, b []byte) error {
errs = multierror.Append(errs, fmt.Errorf("failed to migrate sync workers: %w", err))
}
if err := vault.SetSyncBuffer(prefs.FetchWorkers); err != nil {
errs = multierror.Append(errs, fmt.Errorf("failed to migrate sync buffer: %w", err))
}
if err := vault.SetSyncAttPool(prefs.AttachmentWorkers); err != nil {
errs = multierror.Append(errs, fmt.Errorf("failed to migrate sync attachment pool: %w", err))
}

View File

@ -62,7 +62,6 @@ func TestMigratePrefsToVault(t *testing.T) {
// Check that the other app settings have been migrated.
require.Equal(t, 16, vault.SyncWorkers())
require.Equal(t, 16, vault.SyncBuffer())
require.Equal(t, 16, vault.SyncAttPool())
require.False(t, vault.GetProxyAllowed())
require.False(t, vault.GetShowAllMail())

View File

@ -442,7 +442,6 @@ func (bridge *Bridge) addUserWithVault(
bridge.crashHandler,
bridge.reporter,
bridge.vault.SyncWorkers(),
bridge.vault.SyncBuffer(),
bridge.vault.GetShowAllMail(),
)
if err != nil {

View File

@ -117,7 +117,6 @@ func (user *User) sync(ctx context.Context) error {
user.updateCh,
user.eventCh,
user.syncWorkers,
user.syncBuffer,
); err != nil {
return fmt.Errorf("failed to sync messages: %w", err)
}
@ -187,7 +186,7 @@ func syncMessages( //nolint:funlen
addrKRs map[string]*crypto.KeyRing,
updateCh map[string]*queue.QueuedChannel[imap.Update],
eventCh *queue.QueuedChannel[events.Event],
syncWorkers, _ int,
syncWorkers int,
) error {
ctx, cancel := context.WithCancel(ctx)
defer cancel()

View File

@ -78,7 +78,6 @@ type User struct {
goPollAPIEvents func(wait bool)
syncWorkers int
syncBuffer int
showAllMail uint32
}
@ -92,7 +91,7 @@ func New(
apiUser liteapi.User,
crashHandler async.PanicHandler,
reporter gluonReporter.Reporter,
syncWorkers, syncBuffer int,
syncWorkers int,
showAllMail bool,
) (*User, error) { //nolint:funlen
logrus.WithField("userID", apiUser.ID).Info("Creating new user")
@ -136,7 +135,6 @@ func New(
pollAPIEventsCh: make(chan chan struct{}),
syncWorkers: syncWorkers,
syncBuffer: syncBuffer,
showAllMail: b32(showAllMail),
}

View File

@ -218,7 +218,7 @@ func withUser(tb testing.TB, ctx context.Context, _ *server.Server, m *liteapi.M
vaultUser, err := vault.AddUser(apiUser.ID, username, apiAuth.UID, apiAuth.RefreshToken, saltedKeyPass)
require.NoError(tb, err)
user, err := New(ctx, vaultUser, client, apiUser, nil, nil, vault.SyncWorkers(), vault.SyncBuffer(), true)
user, err := New(ctx, vaultUser, client, apiUser, nil, nil, vault.SyncWorkers(), true)
require.NoError(tb, err)
defer user.Close()

View File

@ -214,18 +214,6 @@ func (vault *Vault) SetSyncWorkers(workers int) error {
})
}
// SyncBuffer returns the number of buffer workers to use for syncing.
func (vault *Vault) SyncBuffer() int {
return vault.get().Settings.SyncBuffer
}
// SetSyncBuffer sets the number of buffer workers to use for syncing.
func (vault *Vault) SetSyncBuffer(buffer int) error {
return vault.mod(func(data *Data) {
data.Settings.SyncBuffer = buffer
})
}
// SyncAttPool returns the size of the attachment pool.
func (vault *Vault) SyncAttPool() int {
return vault.get().Settings.SyncAttPool

View File

@ -223,6 +223,5 @@ func TestVault_Settings_SyncWorkers(t *testing.T) {
s := newVault(t)
require.Equal(t, runtime.NumCPU(), s.SyncWorkers())
require.Equal(t, runtime.NumCPU(), s.SyncBuffer())
require.Equal(t, runtime.NumCPU(), s.SyncAttPool())
}

View File

@ -46,7 +46,6 @@ type Settings struct {
FirstStartGUI bool
SyncWorkers int
SyncBuffer int
SyncAttPool int
}
@ -73,7 +72,6 @@ func newDefaultSettings(gluonDir string) Settings {
FirstStartGUI: true,
SyncWorkers: runtime.NumCPU(),
SyncBuffer: runtime.NumCPU(),
SyncAttPool: runtime.NumCPU(),
}
}