AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Varargified log calls.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5697 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2009-03-26 00:02:19 +00:00
parent 647a25dfdc
commit 688f2580ed
46 changed files with 231 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/peer/server/PeerAuthenticator.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class PeerAuthenticator extends ChainedAuthenticator
rsp.getData().code = AuthResponseData.SUCCESS;
} else {
log.warning("Received invalid peer auth request? [creds=" + pcreds + "].");
log.warning("Received invalid peer auth request?", "creds", pcreds);
rsp.getData().code = AuthCodes.SERVER_ERROR;
}
}
src/java/com/threerings/presents/peer/server/PeerManager.java
+15 -15
View File
@@ -427,7 +427,7 @@ public abstract class PeerManager
Tuple<String,Integer> key = Tuple.newTuple(nodeName, remoteOid);
Tuple<Subscriber<?>, DObject> bits = _proxies.remove(key);
if (bits == null) {
log.warning("Requested to clear unknown proxy [key=" + key + "].");
log.warning("Requested to clear unknown proxy", "key", key);
return;
}
@@ -436,7 +436,7 @@ public abstract class PeerManager
final Client peer = getPeerClient(nodeName);
if (peer == null) {
log.warning("Unable to unsubscribe from proxy, missing peer [key=" + key + "].");
log.warning("Unable to unsubscribe from proxy, missing peer", "key", key);
return;
}
@@ -528,8 +528,8 @@ public abstract class PeerManager
}
} else {
if (result != null) {
log.warning("Tried to release lock held by another peer [lock=" + lock +
", owner=" + result + "].");
log.warning("Tried to release lock held by another peer", "lock", lock,
"owner", result);
}
listener.requestCompleted(result);
}
@@ -550,8 +550,8 @@ public abstract class PeerManager
// make sure we're releasing it
LockHandler handler = _locks.get(lock);
if (handler == null || !handler.getNodeName().equals(_nodeName) || handler.isAcquiring()) {
log.warning("Tried to reacquire lock not being released [lock=" + lock +
", handler=" + handler + "].");
log.warning("Tried to reacquire lock not being released", "lock", lock,
"handler", handler);
return;
}
@@ -621,12 +621,12 @@ public abstract class PeerManager
// some other peer beat us to it
operation.fail(nodeName);
if (nodeName == null) {
log.warning("Lock acquired by null? [lock=" + lock + "].");
log.warning("Lock acquired by null?", "lock", lock);
}
}
}
public void requestFailed (Exception cause) {
log.warning("Lock acquisition failed [lock=" + lock + "].", cause);
log.warning("Lock acquisition failed", "lock", lock, cause);
operation.fail(null);
}
});
@@ -787,8 +787,8 @@ public abstract class PeerManager
// sanity check
if (_nodeobj.clients.contains(clinfo)) {
log.warning("Received clientSessionDidStart() for already registered client!? " +
"[old=" + _nodeobj.clients.get(clinfo.getKey()) + ", new=" + clinfo + "].");
log.warning("Received clientSessionDidStart() for already registered client!?",
"old", _nodeobj.clients.get(clinfo.getKey()), "new", clinfo);
// go ahead and update the record
_nodeobj.updateClients(clinfo);
} else {
@@ -821,7 +821,7 @@ public abstract class PeerManager
return;
}
}
log.warning("Session ended for unregistered client [who=" + username + "].");
log.warning("Session ended for unregistered client", "who", username);
}
/**
@@ -1127,8 +1127,8 @@ public abstract class PeerManager
(_timeout = new Interval(_omgr) {
@Override
public void expired () {
log.warning("Lock handler timed out, acting anyway [lock=" + _lock +
", acquire=" + _acquire + "].");
log.warning("Lock handler timed out, acting anyway", "lock", _lock,
"acquire", _acquire);
activate();
}
}).schedule(LOCK_TIMEOUT);
@@ -1175,8 +1175,8 @@ public abstract class PeerManager
return;
}
if (!_remoids.remove(caller.getOid())) {
log.warning("Received unexpected ratification [handler=" + this +
", who=" + caller.who() + "].");
log.warning("Received unexpected ratification", "handler", this,
"who", caller.who());
}
maybeActivate();
}
src/java/com/threerings/presents/peer/server/PeerNode.java
+3 -4
View File
@@ -220,8 +220,7 @@ public class PeerNode
// documentation inherited from interface Subscriber
public void requestFailed (int oid, ObjectAccessException cause)
{
log.warning("Failed to subscribe to peer's node object " +
"[peer=" + _record + ", cause=" + cause + "].");
log.warning("Failed to subscribe to peer's node object", "peer", _record, "cause", cause);
}
/**
@@ -262,8 +261,8 @@ public class PeerNode
PeerManager.LockHandler handler = _peermgr.getLockHandler(lock);
if (handler == null) {
if (_peermgr.getNodeObject().locks.contains(lock)) {
log.warning("Peer trying to acquire lock owned by this node " +
"[lock=" + lock + ", node=" + _record.nodeName + "].");
log.warning("Peer trying to acquire lock owned by this node", "lock", lock,
"node", _record.nodeName);
return;
}
_peermgr.createLockHandler(PeerNode.this, lock, true);