Merge pull request #79 from matrix-org/rob/consistent-naming

Improve naming consistency

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.")
 )
 

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"

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

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.
 

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"
 )

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"
 )

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"
 )
 

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"
 )
 

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"

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"
 )

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