Rename 'union station service' to 'union station gateway'

phusion · Aug 30, 2010 · 7e76300 · 7e76300
1 parent 285843e
commit 7e76300
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/ext/common/LoggingAgent/LoggingServer.h b/ext/common/LoggingAgent/LoggingServer.h
@@ -1205,13 +1205,13 @@ class LoggingServer: public EventedMessageServer {
 		const string &dir,
 		const string &permissions = DEFAULT_ANALYTICS_LOG_PERMISSIONS,
 		gid_t gid = GROUP_NOT_GIVEN,
-		const string &unionStationServiceAddress = DEFAULT_UNION_STATION_GATEWAY_ADDRESS,
-		unsigned short unionStationServicePort = DEFAULT_UNION_STATION_GATEWAY_PORT,
-		const string &unionStationServiceCert = "")
+		const string &unionStationGatewayAddress = DEFAULT_UNION_STATION_GATEWAY_ADDRESS,
+		unsigned short unionStationGatewayPort = DEFAULT_UNION_STATION_GATEWAY_PORT,
+		const string &unionStationGatewayCert = "")
 		: EventedMessageServer(loop, fd, accountsDatabase),
-		  remoteSender(unionStationServiceAddress,
-		               unionStationServicePort,
-		               unionStationServiceCert),
+		  remoteSender(unionStationGatewayAddress,
+		               unionStationGatewayPort,
+		               unionStationGatewayCert),
 		  garbageCollectionTimer(loop),
 		  sinkFlushingTimer(loop),
 		  exitTimer(loop)

diff --git a/ext/common/LoggingAgent/RemoteSender.h b/ext/common/LoggingAgent/RemoteSender.h
@@ -222,8 +222,8 @@ class RemoteSender {
 
 	typedef shared_ptr<Server> ServerPtr;
 
-	string serviceAddress;
-	unsigned short servicePort;
+	string gatewayAddress;
+	unsigned short gatewayPort;
 	string certificate;
 	BlockingQueue<Item> queue;
 	oxt::thread *thr;
@@ -266,19 +266,19 @@ class RemoteSender {
 	}
 
 	void recheckServers() {
-		P_DEBUG("Rechecking Union Station gateway servers (" << serviceAddress << ")...");
+		P_DEBUG("Rechecking Union Station gateway servers (" << gatewayAddress << ")...");
 
 		vector<string> ips;
 		vector<string>::const_iterator it;
 		string hostName;
 		bool someServersAreDown = false;
 
-		ips = resolveHostname(serviceAddress, servicePort);
+		ips = resolveHostname(gatewayAddress, gatewayPort);
 		P_DEBUG(ips.size() << " Union Station gateway servers found");
 
 		servers.clear();
 		for (it = ips.begin(); it != ips.end(); it++) {
-			ServerPtr server(new Server(*it, serviceAddress, servicePort, certificate));
+			ServerPtr server(new Server(*it, gatewayAddress, gatewayPort, certificate));
 			if (server->ping()) {
 				servers.push_back(server);
 			} else {
@@ -396,11 +396,11 @@ class RemoteSender {
 	}
 
 public:
-	RemoteSender(const string &serviceAddress, unsigned short servicePort, const string &certificate)
+	RemoteSender(const string &gatewayAddress, unsigned short gatewayPort, const string &certificate)
 		: queue(1024)
 	{
-		this->serviceAddress = serviceAddress;
-		this->servicePort = servicePort;
+		this->gatewayAddress = gatewayAddress;
+		this->gatewayPort = gatewayPort;
 		this->certificate = certificate;
 		thr = new oxt::thread(
 			boost::bind(&RemoteSender::threadMain, this),