diff options
| -rw-r--r-- | mullvad-ipc-client/src/lib.rs | 19 | ||||
| -rw-r--r-- | talpid-core/src/logging.rs | 4 |
2 files changed, 12 insertions, 11 deletions
diff --git a/mullvad-ipc-client/src/lib.rs b/mullvad-ipc-client/src/lib.rs index e0b6d0692a..813ec260b8 100644 --- a/mullvad-ipc-client/src/lib.rs +++ b/mullvad-ipc-client/src/lib.rs @@ -71,6 +71,16 @@ error_chain! { static NO_ARGS: [u8; 0] = []; + +pub fn new_standalone_ipc_client(path: &impl AsRef<Path>) -> Result<DaemonRpcClient> { + let path = path.as_ref().to_string_lossy().to_string(); + + new_standalone_transport(path, |path| { + IpcTransport::new(&path, &tokio::reactor::Handle::current()) + .chain_err(|| ErrorKind::TransportError) + }) +} + pub fn new_standalone_transport< F: Send + 'static + FnOnce(String) -> Result<T>, T: jsonrpc_client_core::Transport, @@ -98,15 +108,6 @@ pub fn new_standalone_transport< .map(|client_handle| DaemonRpcClient::new(client_handle)) } -pub fn new_standalone_ipc_client(path: &impl AsRef<Path>) -> Result<DaemonRpcClient> { - let path = path.as_ref().to_string_lossy().to_string(); - - new_standalone_transport(path, |path| { - IpcTransport::new(&path, &tokio::reactor::Handle::current()) - .chain_err(|| ErrorKind::TransportError) - }) -} - fn spawn_transport<F: Send + FnOnce(String) -> Result<T>, T: jsonrpc_client_core::Transport>( address: String, transport_func: F, diff --git a/talpid-core/src/logging.rs b/talpid-core/src/logging.rs index fe77297b84..5b5d4ddfbe 100644 --- a/talpid-core/src/logging.rs +++ b/talpid-core/src/logging.rs @@ -9,11 +9,11 @@ error_chain!{} /// it is backed up with the extension changed to `.old.log`. pub fn rotate_log(file: &Path) -> Result<()> { let backup = file.with_extension("old.log"); - fs::rename(file, backup).unwrap_or_else(|error| { + if let Err(error) = fs::rename(file, backup) { if error.kind() != io::ErrorKind::NotFound { warn!("Failed to rotate log file ({})", error); } - }); + } fs::File::create(file).chain_err(|| "Unable to create new log file")?; Ok(()) |