From 2278848922e135aebada598c0845a84791c41612 Mon Sep 17 00:00:00 2001 From: Robert Swain Date: Thu, 20 Apr 2017 17:57:21 +0200 Subject: [PATCH 1/6] Rename dendrite-clientapi to dendrite-client-api-server --- .../{dendrite-clientapi => dendrite-client-api-server}/main.go | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/github.com/matrix-org/dendrite/cmd/{dendrite-clientapi => dendrite-client-api-server}/main.go (100%) diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-clientapi/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-client-api-server/main.go similarity index 100% rename from src/github.com/matrix-org/dendrite/cmd/dendrite-clientapi/main.go rename to src/github.com/matrix-org/dendrite/cmd/dendrite-client-api-server/main.go From 209ba3f6a3863cdea3401c2b3b957c11cdbcc2c0 Mon Sep 17 00:00:00 2001 From: Robert Swain Date: Thu, 20 Apr 2017 17:58:34 +0200 Subject: [PATCH 2/6] Rename dendrite-roomserver to dendrite-room-server --- .../cmd/{dendrite-roomserver => dendrite-room-server}/main.go | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/github.com/matrix-org/dendrite/cmd/{dendrite-roomserver => dendrite-room-server}/main.go (100%) diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-roomserver/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-room-server/main.go similarity index 100% rename from src/github.com/matrix-org/dendrite/cmd/dendrite-roomserver/main.go rename to src/github.com/matrix-org/dendrite/cmd/dendrite-room-server/main.go From 0939ae3686248ffcdec07de4afd17032a1519689 Mon Sep 17 00:00:00 2001 From: Robert Swain Date: Thu, 20 Apr 2017 18:05:45 +0200 Subject: [PATCH 3/6] Rename dendrite-syncserver to dendrite-sync-api-server --- .../cmd/{dendrite-syncserver => dendrite-sync-api-server}/main.go | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/github.com/matrix-org/dendrite/cmd/{dendrite-syncserver => dendrite-sync-api-server}/main.go (100%) diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-syncserver/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go similarity index 100% rename from src/github.com/matrix-org/dendrite/cmd/dendrite-syncserver/main.go rename to src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go From d8b98cec44843b5b89db279ecbe2e4b235cffe6f Mon Sep 17 00:00:00 2001 From: Robert Swain Date: Thu, 20 Apr 2017 18:12:44 +0200 Subject: [PATCH 4/6] client-api-proxy: roomserver-integration-tests: Fix renamed references --- .../matrix-org/dendrite/cmd/client-api-proxy/main.go | 4 ++-- .../dendrite/cmd/roomserver-integration-tests/main.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/github.com/matrix-org/dendrite/cmd/client-api-proxy/main.go b/src/github.com/matrix-org/dendrite/cmd/client-api-proxy/main.go index b725e6cf..c717eb6c 100644 --- a/src/github.com/matrix-org/dendrite/cmd/client-api-proxy/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/client-api-proxy/main.go @@ -33,8 +33,8 @@ Arguments: ` var ( - syncServerURL = flag.String("sync-server-url", "", "The base URL of the listening 'dendrite-sync-server' process. E.g. 'http://localhost:4200'") - clientAPIURL = flag.String("client-api-url", "", "The base URL of the listening 'dendrite-client-api' process. E.g. 'http://localhost:4321'") + syncServerURL = flag.String("sync-api-server-url", "", "The base URL of the listening 'dendrite-sync-api-server' process. E.g. 'http://localhost:4200'") + clientAPIURL = flag.String("client-api-server-url", "", "The base URL of the listening 'dendrite-client-api-server' process. E.g. 'http://localhost:4321'") bindAddress = flag.String("bind-address", ":8008", "The listening port for the proxy.") ) diff --git a/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go b/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go index 42d974e5..e09a4889 100644 --- a/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go @@ -203,7 +203,7 @@ func testRoomserver(input []string, wantOutput []string, checkQueries func(api.R panic(err) } - cmd := exec.Command(filepath.Join(filepath.Dir(os.Args[0]), "dendrite-roomserver")) + cmd := exec.Command(filepath.Join(filepath.Dir(os.Args[0]), "dendrite-room-server")) // Append the roomserver config to the existing environment. // We append to the environment rather than replacing so that any additional From e281fc4530fd660ead771f674e4b03362b580f65 Mon Sep 17 00:00:00 2001 From: Robert Swain Date: Thu, 20 Apr 2017 18:22:44 +0200 Subject: [PATCH 5/6] syncserver: Rename to syncapi --- .../dendrite/cmd/dendrite-sync-api-server/main.go | 10 +++++----- .../dendrite/{syncserver => syncapi}/README.md | 2 +- .../dendrite/{syncserver => syncapi}/config/config.go | 0 .../{syncserver => syncapi}/consumers/roomserver.go | 8 ++++---- .../{syncserver => syncapi}/routing/routing.go | 4 ++-- .../storage/current_room_state_table.go | 0 .../storage/output_room_events_table.go | 2 +- .../{syncserver => syncapi}/storage/syncserver.go | 2 +- .../dendrite/{syncserver => syncapi}/sync/request.go | 2 +- .../{syncserver => syncapi}/sync/requestpool.go | 4 ++-- .../dendrite/{syncserver => syncapi}/types/types.go | 0 11 files changed, 17 insertions(+), 17 deletions(-) rename src/github.com/matrix-org/dendrite/{syncserver => syncapi}/README.md (99%) rename src/github.com/matrix-org/dendrite/{syncserver => syncapi}/config/config.go (100%) rename src/github.com/matrix-org/dendrite/{syncserver => syncapi}/consumers/roomserver.go (92%) rename src/github.com/matrix-org/dendrite/{syncserver => syncapi}/routing/routing.go (90%) rename src/github.com/matrix-org/dendrite/{syncserver => syncapi}/storage/current_room_state_table.go (100%) rename src/github.com/matrix-org/dendrite/{syncserver => syncapi}/storage/output_room_events_table.go (99%) rename src/github.com/matrix-org/dendrite/{syncserver => syncapi}/storage/syncserver.go (99%) rename src/github.com/matrix-org/dendrite/{syncserver => syncapi}/sync/request.go (96%) rename src/github.com/matrix-org/dendrite/{syncserver => syncapi}/sync/requestpool.go (97%) rename src/github.com/matrix-org/dendrite/{syncserver => syncapi}/types/types.go (100%) diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go index fe74679a..2bbc0c27 100644 --- a/src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go @@ -7,11 +7,11 @@ import ( "os" "path/filepath" - "github.com/matrix-org/dendrite/syncserver/config" - "github.com/matrix-org/dendrite/syncserver/consumers" - "github.com/matrix-org/dendrite/syncserver/routing" - "github.com/matrix-org/dendrite/syncserver/storage" - "github.com/matrix-org/dendrite/syncserver/sync" + "github.com/matrix-org/dendrite/syncapi/config" + "github.com/matrix-org/dendrite/syncapi/consumers" + "github.com/matrix-org/dendrite/syncapi/routing" + "github.com/matrix-org/dendrite/syncapi/storage" + "github.com/matrix-org/dendrite/syncapi/sync" log "github.com/Sirupsen/logrus" "github.com/matrix-org/dugong" diff --git a/src/github.com/matrix-org/dendrite/syncserver/README.md b/src/github.com/matrix-org/dendrite/syncapi/README.md similarity index 99% rename from src/github.com/matrix-org/dendrite/syncserver/README.md rename to src/github.com/matrix-org/dendrite/syncapi/README.md index 1fc62b37..7ead4cd1 100644 --- a/src/github.com/matrix-org/dendrite/syncserver/README.md +++ b/src/github.com/matrix-org/dendrite/syncapi/README.md @@ -1,4 +1,4 @@ -# Sync Server +# Sync API Server This server is responsible for servicing `/sync` requests. It gets its data from the room server output log. diff --git a/src/github.com/matrix-org/dendrite/syncserver/config/config.go b/src/github.com/matrix-org/dendrite/syncapi/config/config.go similarity index 100% rename from src/github.com/matrix-org/dendrite/syncserver/config/config.go rename to src/github.com/matrix-org/dendrite/syncapi/config/config.go diff --git a/src/github.com/matrix-org/dendrite/syncserver/consumers/roomserver.go b/src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go similarity index 92% rename from src/github.com/matrix-org/dendrite/syncserver/consumers/roomserver.go rename to src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go index 8e5fe0ff..da75aff0 100644 --- a/src/github.com/matrix-org/dendrite/syncserver/consumers/roomserver.go +++ b/src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go @@ -6,10 +6,10 @@ import ( log "github.com/Sirupsen/logrus" "github.com/matrix-org/dendrite/common" "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/syncserver/config" - "github.com/matrix-org/dendrite/syncserver/storage" - "github.com/matrix-org/dendrite/syncserver/sync" - "github.com/matrix-org/dendrite/syncserver/types" + "github.com/matrix-org/dendrite/syncapi/config" + "github.com/matrix-org/dendrite/syncapi/storage" + "github.com/matrix-org/dendrite/syncapi/sync" + "github.com/matrix-org/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib" sarama "gopkg.in/Shopify/sarama.v1" ) diff --git a/src/github.com/matrix-org/dendrite/syncserver/routing/routing.go b/src/github.com/matrix-org/dendrite/syncapi/routing/routing.go similarity index 90% rename from src/github.com/matrix-org/dendrite/syncserver/routing/routing.go rename to src/github.com/matrix-org/dendrite/syncapi/routing/routing.go index c6171fff..4ce41023 100644 --- a/src/github.com/matrix-org/dendrite/syncserver/routing/routing.go +++ b/src/github.com/matrix-org/dendrite/syncapi/routing/routing.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/matrix-org/dendrite/syncserver/config" - "github.com/matrix-org/dendrite/syncserver/sync" + "github.com/matrix-org/dendrite/syncapi/config" + "github.com/matrix-org/dendrite/syncapi/sync" "github.com/matrix-org/util" "github.com/prometheus/client_golang/prometheus" ) diff --git a/src/github.com/matrix-org/dendrite/syncserver/storage/current_room_state_table.go b/src/github.com/matrix-org/dendrite/syncapi/storage/current_room_state_table.go similarity index 100% rename from src/github.com/matrix-org/dendrite/syncserver/storage/current_room_state_table.go rename to src/github.com/matrix-org/dendrite/syncapi/storage/current_room_state_table.go diff --git a/src/github.com/matrix-org/dendrite/syncserver/storage/output_room_events_table.go b/src/github.com/matrix-org/dendrite/syncapi/storage/output_room_events_table.go similarity index 99% rename from src/github.com/matrix-org/dendrite/syncserver/storage/output_room_events_table.go rename to src/github.com/matrix-org/dendrite/syncapi/storage/output_room_events_table.go index 0a873c4e..c3c58edd 100644 --- a/src/github.com/matrix-org/dendrite/syncserver/storage/output_room_events_table.go +++ b/src/github.com/matrix-org/dendrite/syncapi/storage/output_room_events_table.go @@ -6,7 +6,7 @@ import ( log "github.com/Sirupsen/logrus" "github.com/lib/pq" - "github.com/matrix-org/dendrite/syncserver/types" + "github.com/matrix-org/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/src/github.com/matrix-org/dendrite/syncserver/storage/syncserver.go b/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go similarity index 99% rename from src/github.com/matrix-org/dendrite/syncserver/storage/syncserver.go rename to src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go index 61bcbe11..c65b7206 100644 --- a/src/github.com/matrix-org/dendrite/syncserver/storage/syncserver.go +++ b/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go @@ -5,7 +5,7 @@ import ( // Import the postgres database driver. _ "github.com/lib/pq" "github.com/matrix-org/dendrite/common" - "github.com/matrix-org/dendrite/syncserver/types" + "github.com/matrix-org/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib" ) diff --git a/src/github.com/matrix-org/dendrite/syncserver/sync/request.go b/src/github.com/matrix-org/dendrite/syncapi/sync/request.go similarity index 96% rename from src/github.com/matrix-org/dendrite/syncserver/sync/request.go rename to src/github.com/matrix-org/dendrite/syncapi/sync/request.go index 40108a2b..a7cf44e6 100644 --- a/src/github.com/matrix-org/dendrite/syncserver/sync/request.go +++ b/src/github.com/matrix-org/dendrite/syncapi/sync/request.go @@ -1,7 +1,7 @@ package sync import ( - "github.com/matrix-org/dendrite/syncserver/types" + "github.com/matrix-org/dendrite/syncapi/types" "net/http" "strconv" "time" diff --git a/src/github.com/matrix-org/dendrite/syncserver/sync/requestpool.go b/src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go similarity index 97% rename from src/github.com/matrix-org/dendrite/syncserver/sync/requestpool.go rename to src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go index f3f7bb23..eff24fb0 100644 --- a/src/github.com/matrix-org/dendrite/syncserver/sync/requestpool.go +++ b/src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go @@ -9,8 +9,8 @@ import ( "github.com/matrix-org/dendrite/clientapi/auth" "github.com/matrix-org/dendrite/clientapi/httputil" "github.com/matrix-org/dendrite/clientapi/jsonerror" - "github.com/matrix-org/dendrite/syncserver/storage" - "github.com/matrix-org/dendrite/syncserver/types" + "github.com/matrix-org/dendrite/syncapi/storage" + "github.com/matrix-org/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" ) diff --git a/src/github.com/matrix-org/dendrite/syncserver/types/types.go b/src/github.com/matrix-org/dendrite/syncapi/types/types.go similarity index 100% rename from src/github.com/matrix-org/dendrite/syncserver/types/types.go rename to src/github.com/matrix-org/dendrite/syncapi/types/types.go From 19c9a0c7a5dc0572215ce3d7b96f820f122a6416 Mon Sep 17 00:00:00 2001 From: Robert Swain Date: Thu, 20 Apr 2017 18:47:33 +0200 Subject: [PATCH 6/6] travis-test.sh: Fix import path of room server --- travis-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-test.sh b/travis-test.sh index 96a92df9..de92c425 100755 --- a/travis-test.sh +++ b/travis-test.sh @@ -3,7 +3,7 @@ set -eu # Check that the servers build -gb build github.com/matrix-org/dendrite/cmd/dendrite-roomserver +gb build github.com/matrix-org/dendrite/cmd/dendrite-room-server gb build github.com/matrix-org/dendrite/cmd/roomserver-integration-tests # Run the pre commit hooks