From 28fd0809e05a77a1909c2c6569bff42a0dd3bcf3 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Sun, 5 May 2019 16:51:23 +0100 Subject: [PATCH] The Great Renaming broker -> server, part 2 --- imperative/broker.rkt | 5 ----- imperative/distributed.rkt | 5 +++++ imperative/{broker => distributed}/client.rkt | 6 +++--- .../{broker => distributed}/client/loopback.rkt | 2 +- imperative/{broker => distributed}/client/tcp.rkt | 0 imperative/{broker => distributed}/federation.rkt | 0 imperative/{broker => distributed}/main.rkt | 12 ++++++------ imperative/{broker => distributed}/protocol.rkt | 0 imperative/{broker => distributed}/server.rkt | 0 imperative/{broker => distributed}/server/tcp.rkt | 2 +- .../{broker => distributed}/server/websocket.rkt | 2 +- imperative/{broker => distributed}/tf.rkt | 0 imperative/{broker => distributed}/wire-protocol.rkt | 0 ...broker-chat-client.rkt => server-chat-client.rkt} | 2 +- .../{broker => distributed}/nesting-confusion.rkt | 8 ++++---- .../observation-visibility.rkt | 4 ++-- 16 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 imperative/broker.rkt create mode 100644 imperative/distributed.rkt rename imperative/{broker => distributed}/client.rkt (87%) rename imperative/{broker => distributed}/client/loopback.rkt (91%) rename imperative/{broker => distributed}/client/tcp.rkt (100%) rename imperative/{broker => distributed}/federation.rkt (100%) rename imperative/{broker => distributed}/main.rkt (82%) rename imperative/{broker => distributed}/protocol.rkt (100%) rename imperative/{broker => distributed}/server.rkt (100%) rename imperative/{broker => distributed}/server/tcp.rkt (93%) rename imperative/{broker => distributed}/server/websocket.rkt (95%) rename imperative/{broker => distributed}/tf.rkt (100%) rename imperative/{broker => distributed}/wire-protocol.rkt (100%) rename imperative/examples/{broker-chat-client.rkt => server-chat-client.rkt} (95%) rename imperative/test/{broker => distributed}/nesting-confusion.rkt (95%) rename imperative/test/{broker => distributed}/observation-visibility.rkt (91%) diff --git a/imperative/broker.rkt b/imperative/broker.rkt deleted file mode 100644 index 5b1d346..0000000 --- a/imperative/broker.rkt +++ /dev/null @@ -1,5 +0,0 @@ -#lang imperative-syndicate - -(provide (all-from-out "broker/main.rkt")) -(require/activate "broker/main.rkt") -(module+ main (require (submod "broker/main.rkt" main))) diff --git a/imperative/distributed.rkt b/imperative/distributed.rkt new file mode 100644 index 0000000..a1f769b --- /dev/null +++ b/imperative/distributed.rkt @@ -0,0 +1,5 @@ +#lang imperative-syndicate + +(provide (all-from-out "distributed/main.rkt")) +(require/activate "distributed/main.rkt") +(module+ main (require (submod "distributed/main.rkt" main))) diff --git a/imperative/broker/client.rkt b/imperative/distributed/client.rkt similarity index 87% rename from imperative/broker/client.rkt rename to imperative/distributed/client.rkt index e0cdb9b..59aa372 100644 --- a/imperative/broker/client.rkt +++ b/imperative/distributed/client.rkt @@ -6,7 +6,7 @@ (require "protocol.rkt") (require imperative-syndicate/term) -(define-logger syndicate/broker) +(define-logger syndicate/distributed) (spawn #:name 'client-factory (during (to-server $a _) (assert (server-connection a))) @@ -14,8 +14,8 @@ (during (observe (server-connected $a)) (assert (server-connection a)))) (define (generic-client-session-facet address w) - (on-start (log-syndicate/broker-info "Connected to ~v" address)) - (on-stop (log-syndicate/broker-info "Disconnected from ~v" address)) + (on-start (log-syndicate/distributed-info "Connected to ~v" address)) + (on-stop (log-syndicate/distributed-info "Disconnected from ~v" address)) (assert (server-connected address)) (define next-ep diff --git a/imperative/broker/client/loopback.rkt b/imperative/distributed/client/loopback.rkt similarity index 91% rename from imperative/broker/client/loopback.rkt rename to imperative/distributed/client/loopback.rkt index 150830a..021e7fc 100644 --- a/imperative/broker/client/loopback.rkt +++ b/imperative/distributed/client/loopback.rkt @@ -6,7 +6,7 @@ (require "../wire-protocol.rkt") (require "../protocol.rkt") -(require/activate imperative-syndicate/broker/server) +(require/activate imperative-syndicate/distributed/server) (assertion-struct server-loopback-connection (scope)) diff --git a/imperative/broker/client/tcp.rkt b/imperative/distributed/client/tcp.rkt similarity index 100% rename from imperative/broker/client/tcp.rkt rename to imperative/distributed/client/tcp.rkt diff --git a/imperative/broker/federation.rkt b/imperative/distributed/federation.rkt similarity index 100% rename from imperative/broker/federation.rkt rename to imperative/distributed/federation.rkt diff --git a/imperative/broker/main.rkt b/imperative/distributed/main.rkt similarity index 82% rename from imperative/broker/main.rkt rename to imperative/distributed/main.rkt index 21781a4..f28e703 100644 --- a/imperative/broker/main.rkt +++ b/imperative/distributed/main.rkt @@ -38,15 +38,15 @@ (when tcp-port (spawn-tcp-server! tcp-port)) (when http-port (spawn-websocket-server! http-port))))) -(define-logger syndicate/broker) +(define-logger syndicate/distributed) -(when (log-level? syndicate/broker-logger 'debug) +(when (log-level? syndicate/distributed-logger 'debug) (spawn #:name 'server-debug (on (asserted (server-poa $id $scope)) - (log-syndicate/broker-debug "+ ~v ~v" id scope)) + (log-syndicate/distributed-debug "+ ~v ~v" id scope)) (on (retracted (server-poa $id $scope)) - (log-syndicate/broker-debug "- ~v ~v" id scope)) + (log-syndicate/distributed-debug "- ~v ~v" id scope)) (on (message (message-poa->server $id $p)) - (log-syndicate/broker-debug "IN ~v ~v" id p)) + (log-syndicate/distributed-debug "IN ~v ~v" id p)) (on (message (message-server->poa $id $p)) - (log-syndicate/broker-debug "OUT ~v ~v" id p)))) + (log-syndicate/distributed-debug "OUT ~v ~v" id p)))) diff --git a/imperative/broker/protocol.rkt b/imperative/distributed/protocol.rkt similarity index 100% rename from imperative/broker/protocol.rkt rename to imperative/distributed/protocol.rkt diff --git a/imperative/broker/server.rkt b/imperative/distributed/server.rkt similarity index 100% rename from imperative/broker/server.rkt rename to imperative/distributed/server.rkt diff --git a/imperative/broker/server/tcp.rkt b/imperative/distributed/server/tcp.rkt similarity index 93% rename from imperative/broker/server/tcp.rkt rename to imperative/distributed/server/tcp.rkt index 649127d..2c1ab71 100644 --- a/imperative/broker/server/tcp.rkt +++ b/imperative/distributed/server/tcp.rkt @@ -7,7 +7,7 @@ (require "../wire-protocol.rkt") (require/activate imperative-syndicate/drivers/tcp) -(require/activate imperative-syndicate/broker/server) +(require/activate imperative-syndicate/distributed/server) (define (server-facet/tcp id scope) (assert (tcp-accepted id)) diff --git a/imperative/broker/server/websocket.rkt b/imperative/distributed/server/websocket.rkt similarity index 95% rename from imperative/broker/server/websocket.rkt rename to imperative/distributed/server/websocket.rkt index 03f938a..dc1d5cd 100644 --- a/imperative/broker/server/websocket.rkt +++ b/imperative/distributed/server/websocket.rkt @@ -8,7 +8,7 @@ (require/activate imperative-syndicate/drivers/web) (require/activate imperative-syndicate/drivers/timer) -(require/activate imperative-syndicate/broker/server) +(require/activate imperative-syndicate/distributed/server) (define (server-facet/websocket id scope) (assert (http-accepted id)) diff --git a/imperative/broker/tf.rkt b/imperative/distributed/tf.rkt similarity index 100% rename from imperative/broker/tf.rkt rename to imperative/distributed/tf.rkt diff --git a/imperative/broker/wire-protocol.rkt b/imperative/distributed/wire-protocol.rkt similarity index 100% rename from imperative/broker/wire-protocol.rkt rename to imperative/distributed/wire-protocol.rkt diff --git a/imperative/examples/broker-chat-client.rkt b/imperative/examples/server-chat-client.rkt similarity index 95% rename from imperative/examples/broker-chat-client.rkt rename to imperative/examples/server-chat-client.rkt index 118ebc9..f83e1c1 100644 --- a/imperative/examples/broker-chat-client.rkt +++ b/imperative/examples/server-chat-client.rkt @@ -1,6 +1,6 @@ #lang imperative-syndicate -(require/activate imperative-syndicate/broker) +(require/activate imperative-syndicate/distributed) (require/activate imperative-syndicate/drivers/external-event) (require (only-in racket/port read-line-evt)) diff --git a/imperative/test/broker/nesting-confusion.rkt b/imperative/test/distributed/nesting-confusion.rkt similarity index 95% rename from imperative/test/broker/nesting-confusion.rkt rename to imperative/test/distributed/nesting-confusion.rkt index badb8ac..c54afae 100644 --- a/imperative/test/broker/nesting-confusion.rkt +++ b/imperative/test/distributed/nesting-confusion.rkt @@ -2,7 +2,7 @@ ;; Analogous to the `core/nesting-confusion.rkt` test case. (require (only-in imperative-syndicate/lang activate)) -(require imperative-syndicate/broker) +(require imperative-syndicate/distributed) (assertion-struct researcher (name topic)) @@ -23,7 +23,7 @@ "Added topic: Evil"))) (test-case - [(activate imperative-syndicate/broker) + [(activate imperative-syndicate/distributed) (spawn #:name 'tony (assert (server-proposal "test" (researcher "Tony" "Computering"))) @@ -62,7 +62,7 @@ "Nonspecific claim 123 retracted")))) (test-case - [(activate imperative-syndicate/broker) + [(activate imperative-syndicate/distributed) (spawn #:name 'claimant (assert (server-proposal "test" (claim 123))) @@ -81,7 +81,7 @@ ;;--------------------------------------------------------------------------- (test-case - [(activate imperative-syndicate/broker) + [(activate imperative-syndicate/distributed) (spawn #:name 'inner-monitor (during (server-connected test-address) diff --git a/imperative/test/broker/observation-visibility.rkt b/imperative/test/distributed/observation-visibility.rkt similarity index 91% rename from imperative/test/broker/observation-visibility.rkt rename to imperative/test/distributed/observation-visibility.rkt index 42d658c..a545943 100644 --- a/imperative/test/broker/observation-visibility.rkt +++ b/imperative/test/distributed/observation-visibility.rkt @@ -3,14 +3,14 @@ ;; creation of an assertion of observation in that server's dataspace. (require (only-in imperative-syndicate/lang activate)) -(require imperative-syndicate/broker) +(require imperative-syndicate/distributed) (assertion-struct presence (who)) (define test-address (server-loopback-connection "test")) (test-case - [(activate imperative-syndicate/broker) + [(activate imperative-syndicate/distributed) (spawn #:name 'producer (during (server-connected test-address)