diff options
Diffstat (limited to 'talpid_ipc/src/http_ipc')
| -rw-r--r-- | talpid_ipc/src/http_ipc/connection_info.rs | 10 | ||||
| -rw-r--r-- | talpid_ipc/src/http_ipc/mod.rs | 25 |
2 files changed, 21 insertions, 14 deletions
diff --git a/talpid_ipc/src/http_ipc/connection_info.rs b/talpid_ipc/src/http_ipc/connection_info.rs index 99d87c0603..1c4b3fac32 100644 --- a/talpid_ipc/src/http_ipc/connection_info.rs +++ b/talpid_ipc/src/http_ipc/connection_info.rs @@ -22,11 +22,13 @@ pub fn write(connection_info: &str) -> Result<()> { let file_location = PathBuf::from(IPC_CONNECTION_INFO_FILE); let mut file = open_file(&file_location)?; let res = file.write_all(connection_info.as_bytes()) - .chain_err(|| ErrorKind::WriteConnectionInfoFailed(file_location.clone())); + .chain_err(|| ErrorKind::WriteConnectionInfoFailed(file_location.clone()),); - debug!("Wrote IPC connection info ({}) to {}", - connection_info, - file_location.to_string_lossy()); + debug!( + "Wrote IPC connection info ({}) to {}", + connection_info, + file_location.to_string_lossy() + ); res } diff --git a/talpid_ipc/src/http_ipc/mod.rs b/talpid_ipc/src/http_ipc/mod.rs index 74b4feadef..16195ee69f 100644 --- a/talpid_ipc/src/http_ipc/mod.rs +++ b/talpid_ipc/src/http_ipc/mod.rs @@ -1,8 +1,8 @@ extern crate jsonrpc_core; extern crate jsonrpc_http_server; -use self::jsonrpc_http_server::{ServerBuilder, Server}; -use std::net::{SocketAddr, IpAddr, Ipv4Addr}; +use self::jsonrpc_http_server::{Server, ServerBuilder}; +use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use std::result::Result as StdResult; mod connection_info; @@ -36,8 +36,11 @@ impl ServerHandle { pub fn start(build_router: fn() -> jsonrpc_core::IoHandler) -> Result<ServerHandle> { let server = start_server(build_router).chain_err(|| ErrorKind::UnableToStartServer)?; - let write_result = connection_info::write(server.address()) - .chain_err(|| ErrorKind::FailedToWriteConnectionInfo); + let write_result = connection_info::write(server.address()).chain_err( + || { + ErrorKind::FailedToWriteConnectionInfo + }, + ); if let Err(e) = write_result { error!("Could not write the connection info, killing the IPC server"); server.stop(); @@ -68,10 +71,12 @@ fn start_server_on_port(port: u16, ServerBuilder::new(router) .allow_only_bind_host() .start_http(&listen_addr) - .map(|server| { - ServerHandle { - address: format!("http://{}", listen_addr), - server: server, - } - }) + .map( + |server| { + ServerHandle { + address: format!("http://{}", listen_addr), + server: server, + } + }, + ) } |