Skip to content
This repository was archived by the owner on Feb 18, 2021. It is now read-only.

A couple of cleanups in ServiceProxy #247

Open
jcorbin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

A couple of cleanups in ServiceProxy #247

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1097943
ServiceProxy: fix type doc on knownPeers and co
Feb 18, 2016
def9330
ServiceProxy: rename *getServicePeer => getOrCreateServicePeer
Feb 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions service-proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ function ServiceDispatchHandler(options) {
* relaysFor :: Map<serviceName, List<hostPort>>
* partialRanges :: Map<serviceName, PartialRange>
* exitServices :: Map<serviceName, lastRefresh>
* peersToReap :: Map<hostPort, lastRefresh>
* knownPeers :: Map<hostPort, lastRefresh>
* peersToReap :: Map<hostPort, Map<serviceName, lastRefresh>>
* knownPeers :: Map<hostPort, Map<serviceName, lastRefresh>>
* connectedServicePeers :: Map<serviceName, Map<hostPort, lastRefresh>>
* connectedPeerServices :: Map<hostPort, Map<serviceName, lastRefresh>>
*
Expand Down Expand Up @@ -527,15 +527,15 @@ function getServiceChannel(serviceName, create) {
return serviceChannel;
};

ServiceDispatchHandler.prototype.getServicePeer =
function getServicePeer(serviceName, hostPort) {
ServiceDispatchHandler.prototype.getOrCreateServicePeer =
function getOrCreateServicePeer(serviceName, hostPort) {
var self = this;
var serviceChannel = self.getOrCreateServiceChannel(serviceName);
return self._getServicePeer(serviceChannel, hostPort);
return self._getOrCreateServicePeer(serviceChannel, hostPort);
};

ServiceDispatchHandler.prototype._getServicePeer =
function _getServicePeer(serviceChannel, hostPort) {
ServiceDispatchHandler.prototype._getOrCreateServicePeer =
function _getOrCreateServicePeer(serviceChannel, hostPort) {
var peer = serviceChannel.peers.get(hostPort);
if (!peer) {
peer = serviceChannel.peers.add(hostPort);
Expand Down Expand Up @@ -594,7 +594,7 @@ function createServiceChannel(serviceName) {

if (mode === 'forward') {
for (var i = 0; i < exitNames.length; i++) {
self._getServicePeer(serviceChannel, exitNames[i]);
self._getOrCreateServicePeer(serviceChannel, exitNames[i]);
}
}

Expand Down Expand Up @@ -636,7 +636,7 @@ function refreshServicePeer(serviceName, hostPort) {
// Mark known peers, so they are candidates for future reaping
addIndexEntry(self.knownPeers, hostPort, serviceName, now);

var peer = self.getServicePeer(serviceName, hostPort);
var peer = self.getOrCreateServicePeer(serviceName, hostPort);
self.ensurePeerConnected(serviceName, peer, 'service peer refresh', now);
};

Expand Down Expand Up @@ -733,7 +733,7 @@ function refreshServicePeerPartially(serviceName, hostPort, now) {
partialRange.addWorker(hostPort, now);
}

peer = self._getServicePeer(serviceChannel, hostPort);
peer = self._getOrCreateServicePeer(serviceChannel, hostPort);

// Unmark recently seen peers, so they don't get reaped
deleteIndexEntry(self.peersToReap, hostPort, serviceName);
Expand Down Expand Up @@ -871,7 +871,7 @@ function computeAffinityChange(serviceChannel, partialRange, now) {
};
for (i = 0; i < partialRange.affineWorkers.length; i++) {
worker = partialRange.affineWorkers[i];
peer = self._getServicePeer(serviceChannel, worker);
peer = self._getOrCreateServicePeer(serviceChannel, worker);
isAffine[worker] = true;
if (!(connectedPeers && connectedPeers[worker]) || !peer.isConnected('out')) {
toConnect.push(worker);
Expand All @@ -898,11 +898,11 @@ function implementAffinityChange(serviceChannel, toConnect, toDisconnect, now) {
var peer = null;
var i;
for (i = 0; i < toConnect.length; i++) {
peer = self._getServicePeer(serviceChannel, toConnect[i]);
peer = self._getOrCreateServicePeer(serviceChannel, toConnect[i]);
self.ensurePeerConnected(serviceName, peer, 'service peer affinity change', now);
}
for (i = 0; i < toDisconnect.length; i++) {
peer = self._getServicePeer(serviceChannel, toDisconnect[i]);
peer = self._getOrCreateServicePeer(serviceChannel, toDisconnect[i]);
self.ensurePeerDisconnected(serviceName, peer, 'service peer affinity change', now);
}
};
Expand Down Expand Up @@ -1143,7 +1143,7 @@ function changeToForward(exitNodes, serviceChannel, now) {
// ... send rpc to new exit nodes
var exitNames = Object.keys(exitNodes);
for (i = 0; i < exitNames.length; i++) {
self._getServicePeer(serviceChannel, exitNames[i]);
self._getOrCreateServicePeer(serviceChannel, exitNames[i]);
}
self.roleTransitionEvent.emit(self, {
serviceChannel: serviceChannel,
Expand Down Expand Up @@ -1173,7 +1173,7 @@ function updateExitNodes(exitNodes, serviceChannel) {
}
var exitNames = Object.keys(exitNodes);
for (i = 0; i < exitNames.length; i++) {
self._getServicePeer(serviceChannel, exitNames[i]);
self._getOrCreateServicePeer(serviceChannel, exitNames[i]);
}
};

Expand Down