From ac7541e571d894a2b998f56c2d15725b632c7d77 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Sat, 28 Apr 2012 09:41:10 -0400 Subject: [PATCH] Name network listeners. --- amqp_relay.ml | 2 +- net.ml | 4 ++-- ocamlmsg.ml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/amqp_relay.ml b/amqp_relay.ml index d12a17b..f057d38 100644 --- a/amqp_relay.ml +++ b/amqp_relay.ml @@ -406,4 +406,4 @@ let init () = Node.send_ignore "factory" (Message.create (Sexp.Str "fanout", Sexp.Arr [Sexp.Str "amq.fanout"], Sexp.Str "", Sexp.Str "")); - ignore (Util.create_thread "AMQP listener" None (Net.start_net Amqp_spec.port) start) + ignore (Util.create_thread "AMQP listener" None (Net.start_net "AMQP" Amqp_spec.port) start) diff --git a/net.ml b/net.ml index b01a83a..9044cce 100644 --- a/net.ml +++ b/net.ml @@ -23,10 +23,10 @@ let rec accept_loop sock connection_start_fn = ignore (connection_start_fn (s, peername)); accept_loop sock connection_start_fn -let start_net port_number connection_start_fn = +let start_net protocol_name port_number connection_start_fn = let sock = socket PF_INET SOCK_STREAM 0 in setsockopt sock SO_REUSEADDR true; bind sock (ADDR_INET (inet_addr_of_string "0.0.0.0", port_number)); listen sock 5; - Log.info "Accepting connections" [Sexp.Str (string_of_int port_number)]; + Log.info "Accepting connections" [Sexp.Str protocol_name; Sexp.Str (string_of_int port_number)]; accept_loop sock connection_start_fn diff --git a/ocamlmsg.ml b/ocamlmsg.ml index a4ad571..20fa5ae 100644 --- a/ocamlmsg.ml +++ b/ocamlmsg.ml @@ -36,4 +36,4 @@ let _ = hook_log (); Amqp_relay.init (); (* Speedtest.init (); *) - Net.start_net 5671 Relay.start + Net.start_net "Hop" 5671 Relay.start