starred/shadowsocks-rust
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-rust.git synced 2026-11-15 00:15:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prints plugin process ID in log

Browse Source
This commit is contained in:
zonyitoo
2020-05-07 21:06:21 +08:00
parent 74d3c61f8e
commit ea24418ffc
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugin/mod.rs
+25 -10
View File
@@ -140,7 +140,7 @@ impl Plugins {
let loop_ip = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1));
let local_addr = SocketAddr::new(loop_ip, get_local_port()?);
let svr_addr = match start_plugin(c, svr.addr(), &local_addr, mode) {
match start_plugin(c, svr.addr(), &local_addr, mode) {
Err(err) => {
error!(
"failed to start plugin \"{}\" for server {}, err: {}",
@@ -152,19 +152,34 @@ impl Plugins {
}
Ok(process) => {
let svr_addr = ServerAddr::SocketAddr(local_addr);
match mode {
PluginMode::Client => {
info!(
"started plugin \"{}\" on {} <-> {} ({})",
c.plugin,
local_addr,
svr.addr(),
process.id()
);
}
PluginMode::Server => {
info!(
"started plugin \"{}\" on {} <-> {} ({})",
c.plugin,
svr.addr(),
local_addr,
process.id()
);
}
}
plugins.push(process);
// Replace addr with plugin
svr_addr
// Replace addr with plugin, svr is borrowed immutable.
svr_addr_opt = Some(svr_addr);
}
};
match mode {
PluginMode::Client => info!("started plugin \"{}\" on {} <-> {}", c.plugin, local_addr, svr.addr()),
PluginMode::Server => info!("started plugin \"{}\" on {} <-> {}", c.plugin, svr.addr(), local_addr),
}
svr_addr_opt = Some(svr_addr); // Fuck borrow checker
}
if let Some(svr_addr) = svr_addr_opt {