diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-07-21 23:14:17 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-07-21 23:14:17 +0100 |
| commit | ea0ec284855f706e65a9643ac1d6335c1439332b (patch) | |
| tree | 5ac6797e7bdd5d28b7b5e860a5e10fdee15dc52b | |
| parent | 8e48a4bbb3ae51e2b6eb6b2f8b8154e24a25c14c (diff) | |
| download | rabbitmq-server-git-ea0ec284855f706e65a9643ac1d6335c1439332b.tar.gz | |
cosmetic
| -rw-r--r-- | src/rabbit_networking.erl | 16 | ||||
| -rw-r--r-- | src/tcp_listener.erl | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index 59d0594ed4..eed21a01cd 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -107,13 +107,16 @@ check_tcp_listener_address(NamePrefix, Host, Port) -> {IPAddress, Name}. start_tcp_listener(Host, Port) -> - start_listener(Host, Port, "TCP Listener", {?MODULE, start_client, []}). + start_listener(Host, Port, "TCP Listener", + {?MODULE, start_client, []}). start_ssl_listener(Host, Port, SslOpts) -> - start_listener(Host, Port, "SSL Listener", {?MODULE, ssl_connection_upgrade, [SslOpts]}). + start_listener(Host, Port, "SSL Listener", + {?MODULE, ssl_connection_upgrade, [SslOpts]}). start_listener(Host, Port, Label, OnConnect) -> - {IPAddress, Name} = check_tcp_listener_address(rabbit_tcp_listener_sup, Host, Port), + {IPAddress, Name} = + check_tcp_listener_address(rabbit_tcp_listener_sup, Host, Port), {ok,_} = supervisor:start_child( rabbit_sup, {Name, @@ -140,7 +143,6 @@ tcp_listener_started(IPAddress, Port) -> host = tcp_host(IPAddress), port = Port}). - tcp_listener_stopped(IPAddress, Port) -> ok = mnesia:dirty_delete_object( rabbit_listener, @@ -172,12 +174,12 @@ ssl_connection_upgrade(SslOpts, Sock) -> {ok, SslSock} -> rabbit_log:info("upgraded TCP connection from ~s:~p to SSL~n", [PeerIp, PeerPort]), - RabbitSslSock = #ssl_socket{tcp=Sock, ssl=SslSock}, + RabbitSslSock = #ssl_socket{tcp = Sock, ssl = SslSock}, start_client(RabbitSslSock); {error, Reason} -> gen_tcp:close(Sock), - rabbit_log:error("failed to upgrade TCP connection from ~s:~p to SSL: ~n~p~n", - [PeerIp, PeerPort, Reason]), + rabbit_log:error("failed to upgrade TCP connection from ~s:~p " + "to SSL: ~n~p~n", [PeerIp, PeerPort, Reason]), {error, Reason} end. diff --git a/src/tcp_listener.erl b/src/tcp_listener.erl index ad13a1ccae..4a2e149bb8 100644 --- a/src/tcp_listener.erl +++ b/src/tcp_listener.erl @@ -68,9 +68,9 @@ init({IPAddress, Port, SocketOpts, error_logger:info_msg("started ~s on ~s:~p~n", [Label, inet_parse:ntoa(LIPAddress), LPort]), apply(M, F, A ++ [IPAddress, Port]), - {ok, #state{sock=LSock, + {ok, #state{sock = LSock, on_startup = OnStartup, on_shutdown = OnShutdown, - label=Label}}; + label = Label}}; {error, Reason} -> error_logger:error_msg( "failed to start ~s on ~s:~p - ~p~n", |