Merge pull request #33 from Mavulp/webserver

Webserver

2 files changed, 7 insertions, 5 deletions

diff --git a/src/teamspeak/bbcode.rs b/src/teamspeak/bbcode.rs
index 28be08a..91d576a 100644
--- a/src/teamspeak/bbcode.rs
+++ b/src/teamspeak/bbcode.rs
@@ -1,4 +1,4 @@
-use std::fmt::{Formatter, Display, Error};
+use std::fmt::{Display, Error, Formatter};
 
 #[allow(dead_code)]
 pub enum BbCode<'a> {
@@ -14,7 +14,9 @@ impl<'a> Display for BbCode<'a> {
             BbCode::Bold(text) => fmt.write_fmt(format_args!("[B]{}[/B]", text))?,
             BbCode::Italic(text) => fmt.write_fmt(format_args!("[I]{}[/I]", text))?,
             BbCode::Underline(text) => fmt.write_fmt(format_args!("[U]{}[/U]", text))?,
-            BbCode::Link(text, url) => fmt.write_fmt(format_args!("[URL={}]{}[/URL]", url, text))?,
+            BbCode::Link(text, url) => {
+                fmt.write_fmt(format_args!("[URL={}]{}[/URL]", url, text))?
+            }
         };
 
         Ok(())
diff --git a/src/teamspeak/mod.rs b/src/teamspeak/mod.rs
index 5ac0d44..7551e77 100644
--- a/src/teamspeak/mod.rs
+++ b/src/teamspeak/mod.rs
@@ -1,4 +1,4 @@
-use std::sync::{Arc, Mutex};
+use std::sync::{Arc, RwLock};
 use std::time::{Duration, Instant};
 
 use futures::compat::Future01CompatExt;
@@ -76,7 +76,7 @@ fn get_message<'a>(event: &Event) -> Option<MusicBotMessage> {
 
 impl TeamSpeakConnection {
     pub async fn new(
-        tx: Arc<Mutex<UnboundedSender<MusicBotMessage>>>,
+        tx: Arc<RwLock<UnboundedSender<MusicBotMessage>>>,
         options: ConnectOptions,
     ) -> Result<TeamSpeakConnection, tsclientlib::Error> {
         let conn = Connection::new(options).compat().await?;
@@ -89,7 +89,7 @@ impl TeamSpeakConnection {
                 if let ConEvents(_conn, events) = e {
                     for event in *events {
                         if let Some(msg) = get_message(event) {
-                            let tx = tx.lock().expect("Mutex was not poisoned");
+                            let tx = tx.read().expect("RwLock was not poisoned");
                             // Ignore the result because the receiver might get dropped first.
                             let _ = tx.send(msg);
                         }