DGNum/rust-irc
6
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Fixed a bug with the drop behavior for IrcServer.

Browse source
This commit is contained in:
Aaron Weiss 2016-01-03 08:32:45 -05:00
parent 6ece3e25fe
commit 33004abc12
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/client/server/mod.rs
View file

@ -36,8 +36,8 @@ pub trait Server<'a, T: IrcRead, U: IrcWrite> {
/// A thread-safe implementation of an IRC Server connection. /// A thread-safe implementation of an IRC Server connection.
pub struct IrcServer<T: IrcRead, U: IrcWrite> { pub struct IrcServer<T: IrcRead, U: IrcWrite> {
state: Arc<ServerState<T, U>>,
tx: Sender<Message>, tx: Sender<Message>,
state: Arc<ServerState<T, U>>,
} }
/// Thread-safe internal state for an IRC server connection. /// Thread-safe internal state for an IRC server connection.
@ -83,7 +83,7 @@ impl IrcServer<BufReader<NetStream>, BufWriter<NetStream>> {
impl<T: IrcRead, U: IrcWrite> Clone for IrcServer<T, U> { impl<T: IrcRead, U: IrcWrite> Clone for IrcServer<T, U> {
fn clone(&self) -> IrcServer<T, U> { fn clone(&self) -> IrcServer<T, U> {
IrcServer { state: self.state.clone(), tx: self.tx.clone() } IrcServer { tx: self.tx.clone(), state: self.state.clone() }
} }
} }
@ -143,18 +143,15 @@ impl<T: IrcRead, U: IrcWrite> IrcServer<T, U> {
alt_nick_index: RwLock::new(0), alt_nick_index: RwLock::new(0),
}); });
let weak = Arc::downgrade(&state); let weak = Arc::downgrade(&state);
let write_handle = spawn(move || { let write_handle = spawn(move || while let Ok(msg) = rx.recv() {
while let Some(strong) = weak.upgrade() { if let Some(strong) = weak.upgrade() {
match rx.recv() { IrcServer::write(&strong, msg);
Ok(msg) => { IrcServer::write(&strong, msg); },
Err(_) => ()
}
} }
}); });
let state2 = state.clone(); let state2 = state.clone();
let mut handle = state2.write_handle.lock().unwrap(); let mut handle = state2.write_handle.lock().unwrap();
*handle = Some(write_handle); *handle = Some(write_handle);
IrcServer { state: state, tx: tx } IrcServer { tx: tx, state: state }
} }
/// Gets a reference to the IRC server's connection. /// Gets a reference to the IRC server's connection.