diff options
author | Hilmar Gústafsson <LiHRaM@users.noreply.github.com> | 2020-04-14 17:15:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-14 16:15:59 +0100 |
commit | 73d2f59e303fa998f997c483bb6843bf77e069e5 (patch) | |
tree | a10ca5e3976f4ec1f3c1a87472dc475b10ad6af7 /publicroomsapi/storage | |
parent | 48303d06cb91d19582f776af32ee22e5d820f031 (diff) |
WIP: Add libp2p-go (#956)
* Add libp2p-go
* Some tweaks, tidying up
(cherry picked from commit 1a5bb121f8121c4f68a27abbf25a9a35a1b7c63e)
* Move p2p dockerfile
(cherry picked from commit 8d3bf44ea1bf37f950034e73bcdc315afdabe79a)
* Remove containsBackwardsExtremity
* Fix some linter errors, update some libp2p packages/calls, other tidying up
* Add -port for dendrite-p2p-demo
* Use instance name as key ID
* Remove P2P demo docker stuff, no longer needed now that we have SQLite
* Remove Dockerfile-p2p too
* Remove p2p logic from dendrite-monolith-server
* Inject publicRoomsDB in publicroomsapi
Inject publicRoomsDB instead of switching on base.libP2P.
See: https://github.com/matrix-org/dendrite/pull/956/files?file-filters%5B%5D=.go#r406276914
* Fix lint warning
* Extract mDNSListener from base.go
* Extract CreateFederationClient into demo
* Create P2PDendrite from BaseDendrite
Extract logic specific to P2PDendrite from base.go
* Set base.go to upstream/master
* Move pubsub to demo cmd
* Move PostgreswithDHT to cmd
* Remove unstable features
* Add copyrights
* Move libp2pvalidator into p2pdendrite
* Rename dendrite-p2p-demo -> dendrite-demo-libp2p
* Update copyrights
* go mod tidy
Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
Diffstat (limited to 'publicroomsapi/storage')
-rw-r--r-- | publicroomsapi/storage/storage.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/publicroomsapi/storage/storage.go b/publicroomsapi/storage/storage.go index 41dbd781..e674514a 100644 --- a/publicroomsapi/storage/storage.go +++ b/publicroomsapi/storage/storage.go @@ -23,6 +23,9 @@ import ( "github.com/matrix-org/dendrite/publicroomsapi/storage/sqlite3" ) +const schemePostgres = "postgres" +const schemeFile = "file" + // NewPublicRoomsServerDatabase opens a database connection. func NewPublicRoomsServerDatabase(dataSourceName string) (Database, error) { uri, err := url.Parse(dataSourceName) @@ -30,9 +33,9 @@ func NewPublicRoomsServerDatabase(dataSourceName string) (Database, error) { return postgres.NewPublicRoomsServerDatabase(dataSourceName) } switch uri.Scheme { - case "postgres": + case schemePostgres: return postgres.NewPublicRoomsServerDatabase(dataSourceName) - case "file": + case schemeFile: return sqlite3.NewPublicRoomsServerDatabase(dataSourceName) default: return postgres.NewPublicRoomsServerDatabase(dataSourceName) |