-
-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Move events contents to common * Basic database structure * Complete database update * Support visibility update and retrieval * Add HTTP methods for visibility update and retrieval * Add the database for the new component * Add a listener for the new component * Fix attribute update statements * Create public rooms component * Fix failing test * Add roomserver consumer * Fix a bug in aliases creation * Add a check on type * Implement public rooms directory * Use auth API for visibility update * Support filtering * Add component to monolith * Various fixes * Fix computation of next public rooms batch * Retrieve state events from the roomserver query API + avoid dupes on join * Split update of string or boolean attribute in two separate functions * Use event type to detect duplicate joins * Improve the joined members counter computation * Use event.RoomID()
- Loading branch information
1 parent
fc86821
commit b15ce90
Showing
22 changed files
with
1,098 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
src/github.com/matrix-org/dendrite/cmd/dendrite-public-rooms-api-server/main.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| // Copyright 2017 Vector Creations Ltd | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "flag" | ||
| "net/http" | ||
| "os" | ||
|
|
||
| "github.com/gorilla/mux" | ||
| "github.com/matrix-org/dendrite/clientapi/auth/storage/devices" | ||
| "github.com/matrix-org/dendrite/common" | ||
| "github.com/matrix-org/dendrite/common/config" | ||
| "github.com/matrix-org/dendrite/publicroomsapi/consumers" | ||
| "github.com/matrix-org/dendrite/publicroomsapi/routing" | ||
| "github.com/matrix-org/dendrite/publicroomsapi/storage" | ||
| "github.com/matrix-org/dendrite/roomserver/api" | ||
|
|
||
| log "github.com/Sirupsen/logrus" | ||
| sarama "gopkg.in/Shopify/sarama.v1" | ||
| ) | ||
|
|
||
| var configPath = flag.String("config", "dendrite.yaml", "The path to the config file. For more information, see the config file in this repository.") | ||
|
|
||
| func main() { | ||
| common.SetupLogging(os.Getenv("LOG_DIR")) | ||
|
|
||
| flag.Parse() | ||
|
|
||
| if *configPath == "" { | ||
| log.Fatal("--config must be supplied") | ||
| } | ||
| cfg, err := config.Load(*configPath) | ||
| if err != nil { | ||
| log.Fatalf("Invalid config file: %s", err) | ||
| } | ||
|
|
||
| queryAPI := api.NewRoomserverQueryAPIHTTP(cfg.RoomServerURL(), nil) | ||
|
|
||
| db, err := storage.NewPublicRoomsServerDatabase(string(cfg.Database.PublicRoomsAPI)) | ||
| if err != nil { | ||
| log.Panicf("startup: failed to create public rooms server database with data source %s : %s", cfg.Database.PublicRoomsAPI, err) | ||
| } | ||
|
|
||
| deviceDB, err := devices.NewDatabase(string(cfg.Database.Device), cfg.Matrix.ServerName) | ||
| if err != nil { | ||
| log.Panicf("startup: failed to create device database with data source %s : %s", cfg.Database.Device, err) | ||
| } | ||
|
|
||
| kafkaConsumer, err := sarama.NewConsumer(cfg.Kafka.Addresses, nil) | ||
| if err != nil { | ||
| log.WithFields(log.Fields{ | ||
| log.ErrorKey: err, | ||
| "addresses": cfg.Kafka.Addresses, | ||
| }).Panic("Failed to setup kafka consumers") | ||
| } | ||
|
|
||
| roomConsumer := consumers.NewOutputRoomEvent(cfg, kafkaConsumer, db, queryAPI) | ||
| if err != nil { | ||
| log.Panicf("startup: failed to create room server consumer: %s", err) | ||
| } | ||
| if err = roomConsumer.Start(); err != nil { | ||
| log.Panicf("startup: failed to start room server consumer: %s", err) | ||
| } | ||
|
|
||
| log.Info("Starting public rooms server on ", cfg.Listen.PublicRoomsAPI) | ||
|
|
||
| api := mux.NewRouter() | ||
| routing.Setup(api, deviceDB, db) | ||
| common.SetupHTTPAPI(http.DefaultServeMux, api) | ||
|
|
||
| log.Fatal(http.ListenAndServe(string(cfg.Listen.PublicRoomsAPI), nil)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # Public rooms API | ||
|
|
||
| This server is responsible for serving requests hitting `/publicRooms` and `/directory/list/room/{roomID}` as per: | ||
|
|
||
| https://matrix.org/docs/spec/client_server/r0.2.0.html#listing-rooms |
Oops, something went wrong.