diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-02-18 11:32:45 +0000 |
|---|---|---|
| committer | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-02-18 11:32:45 +0000 |
| commit | 9bd5e414c9afec735b2309769876b62c4bbd2b8f (patch) | |
| tree | a23d61ec2445cd1afd5437cdf54c34f021d7a9bd | |
| parent | 153bfbbea579dfa10e8e804036f17c1a33b6fe80 (diff) | |
Missing commit from #2186
| -rw-r--r-- | build/gobind-pinecone/monolith.go | 1 | ||||
| -rw-r--r-- | keyserver/internal/internal.go | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/build/gobind-pinecone/monolith.go b/build/gobind-pinecone/monolith.go index acf4406c..aa8cc6e6 100644 --- a/build/gobind-pinecone/monolith.go +++ b/build/gobind-pinecone/monolith.go @@ -283,6 +283,7 @@ func (m *DendriteMonolith) Start() { cfg.Global.KeyID = gomatrixserverlib.KeyID(signing.KeyID) cfg.Global.JetStream.StoragePath = config.Path(fmt.Sprintf("%s/%s", m.StorageDirectory, prefix)) cfg.UserAPI.AccountDatabase.ConnectionString = config.DataSource(fmt.Sprintf("file:%s/%s-account.db", m.StorageDirectory, prefix)) + cfg.MediaAPI.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s/dendrite-p2p-mediaapi.db", m.StorageDirectory)) cfg.SyncAPI.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s/%s-syncapi.db", m.StorageDirectory, prefix)) cfg.RoomServer.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s/%s-roomserver.db", m.StorageDirectory, prefix)) cfg.KeyServer.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s/%s-keyserver.db", m.StorageDirectory, prefix)) diff --git a/keyserver/internal/internal.go b/keyserver/internal/internal.go index 1c6b0677..0c264b71 100644 --- a/keyserver/internal/internal.go +++ b/keyserver/internal/internal.go @@ -595,12 +595,10 @@ func (a *KeyInternalAPI) uploadLocalDeviceKeys(ctx context.Context, req *api.Per if len(toClean) > 0 { if err = a.DB.DeleteDeviceKeys(ctx, req.UserID, toClean); err != nil { - res.Error = &api.KeyError{ - Err: fmt.Sprintf("failed to clean device keys: %s", err.Error()), - } - return + logrus.WithField("user_id", req.UserID).WithError(err).Errorf("Failed to clean up %d stale keyserver device key entries", len(toClean)) + } else { + logrus.WithField("user_id", req.UserID).Debugf("Cleaned up %d stale keyserver device key entries", len(toClean)) } - logrus.WithField("user_id", req.UserID).Infof("Cleaned up %d stale keyserver device key entries", len(toClean)) } var keysToStore []api.DeviceMessage |