Less gratuitous noise in federated situation. (Really need subscription aggregation!)

This commit is contained in:
Tony Garnock-Jones 2019-06-07 15:51:54 +01:00
parent c718d04291
commit 5e6c1e5cb9
2 changed files with 16 additions and 8 deletions

View File

@ -377,13 +377,17 @@ spawn named 'from-node-relay' {
during Observe(C.FromServer($addr, FromNode($node, $spec))) {
on start debug('?+', addr.toString(), node.toString(), spec.toString());
on stop debug('?-', addr.toString(), node.toString(), spec.toString());
during C.FromServer(addr, RestrictedFromNode(node, spec.toString(), $vs)) {
on asserted C.FromServer(addr, RestrictedFromNode(node, spec.toString(), $vs)) {
// ^ TODO: Use real quoting instead of spec.toString() hack!!
// TODO: Shouldn't the dataspace/client be doing the necessary quoting for us??
const a = Skeleton.instantiateAssertion(C.FromServer(addr, FromNode(node, spec)), vs);
on start debug('+', a.toString());
on stop debug('-', a.toString());
assert a;
debug('+', a.toString());
currentFacet().actor.adhocAssert(a);
}
on retracted C.FromServer(addr, RestrictedFromNode(node, spec.toString(), $vs)) {
const a = Skeleton.instantiateAssertion(C.FromServer(addr, FromNode(node, spec)), vs);
debug('-', a.toString());
currentFacet().actor.adhocRetract(a);
}
on message C.FromServer(addr, RestrictedFromNode(node, spec.toString(), $vs)) {
const a = Skeleton.instantiateAssertion(C.FromServer(addr, FromNode(node, spec)), vs);

View File

@ -72,12 +72,16 @@ spawn named 'test-remap' {
spawn named 'to-node-relay' {
const debug = debugFactory('syndicate/server:socks:to-node-relay');
during C.ServerConnected(server_addr) {
during C.FromServer(server_addr, ToNode(nodeId, $a)) {
on start debug('Remote peer has asserted', a && a.toString());
on stop debug('Remote peer has retracted', a && a.toString());
assert a;
on asserted C.FromServer(server_addr, ToNode(nodeId, $a)) {
debug('Remote peer has asserted', a && a.toString());
currentFacet().actor.adhocAssert(a);
}
on retracted C.FromServer(server_addr, ToNode(nodeId, $a)) {
debug('Remote peer has retracted', a && a.toString());
currentFacet().actor.adhocRetract(a);
}
on message C.FromServer(server_addr, ToNode(nodeId, $a)) {
debug('Remote peer has sent', a && a.toString());
send a;
}
during C.FromServer(server_addr, Observe(FromNode(nodeId, $spec))) {