fix(global): swap debug and trace log calls

Trace calls have less of a priority than debug calls, so I swapped em'.

6 files changed, 31 insertions, 31 deletions

diff --git a/whirl_server/src/distributor.rs b/whirl_server/src/distributor.rs
index ae920cb..897f6ec 100644
--- a/whirl_server/src/distributor.rs
+++ b/whirl_server/src/distributor.rs
@@ -64,7 +64,7 @@ impl Server for Distributor {
             for msg in parse_commands_from_packet(msg) {
               match msg.get(2).unwrap().to_owned() as i32 {
                 PROPREQ => {
-                  trace!("received property request from client");
+                  debug!("received property request from client");
 
                   peer.bytes.get_mut()
                     .write_all(&create_property_update_as_distributor()).await?;
@@ -76,14 +76,14 @@ impl Server for Distributor {
                     VAR_USERNAME,
                   ).value.clone();
 
-                  trace!("received session initialization from {}", username);
+                  debug!("received session initialization from {}", username);
 
                   peer.bytes.get_mut()
                     .write_all(&create_property_request_as_distributor()).await?;
                   trace!("sent property request to {}", username);
                 }
                 PROPSET => {
-                  trace!("received property set from {}", username);
+                  debug!("received property set from {}", username);
 
                   peer.bytes.get_mut()
                     .write_all(&Text {
@@ -96,7 +96,7 @@ impl Server for Distributor {
                 }
                 BUDDYLISTUPDATE => {
                   let buddy = BuddyList::parse(msg.to_vec());
-                  trace!("received buddy list update from {}: {}", username, buddy.buddy);
+                  debug!("received buddy list update from {}: {}", username, buddy.buddy);
                   peer.bytes.get_mut().write_all(&BuddyList {
                     ..buddy.clone()
                   }.create()).await?;
@@ -104,16 +104,16 @@ impl Server for Distributor {
                 }
                 ROOMIDRQ => {
                   let room = RoomIdRequest::parse(msg.to_vec());
-                  trace!("received room id request from {}: {}", username, &room.room_name);
+                  debug!("received room id request from {}: {}", username, &room.room_name);
 
                   let room_id;
                   if !room_ids.contains(&room.room_name) {
                     room_ids.push(room.room_name.clone());
                     room_id = room_ids.iter().position(|r| r == &room.room_name).unwrap();
-                    debug!("inserted room: {}", room.room_name);
+                    trace!("inserted room: {}", room.room_name);
                   } else {
                     let position = room_ids.iter().position(|r| r == &room.room_name).unwrap();
-                    debug!("found room: {}", room.room_name);
+                    trace!("found room: {}", room.room_name);
                     room_id = position;
                   }
 
@@ -124,7 +124,7 @@ impl Server for Distributor {
                   trace!("sent redirect id to {}: {}", username, room.room_name);
                 }
                 SESSEXIT => {
-                  trace!("received session exit from {}", username); break;
+                  debug!("received session exit from {}", username); break;
                 }
                 _ => (),
               }
@@ -139,11 +139,11 @@ impl Server for Distributor {
     }
 
     // Deregister client
-    trace!("de-registering client");
+    debug!("de-registering client");
     {
       state.lock().await.peers.remove(&count.to_string());
     }
-    trace!("de-registered client");
+    debug!("de-registered client");
 
     Ok(())
   }
diff --git a/whirl_server/src/hub.rs b/whirl_server/src/hub.rs
index 09f2dac..7325aea 100644
--- a/whirl_server/src/hub.rs
+++ b/whirl_server/src/hub.rs
@@ -63,7 +63,7 @@ impl Server for Hub {
             for msg in parse_commands_from_packet(msg) {
               match msg.get(2).unwrap().to_owned() as i32 {
                 PROPREQ => {
-                  trace!("received property request from client");
+                  debug!("received property request from client");
 
                   peer.bytes.get_mut()
                     .write_all(&create_property_update_as_hub()).await?;
@@ -75,14 +75,14 @@ impl Server for Hub {
                     VAR_USERNAME,
                   ).value.clone();
 
-                  trace!("received session initialization from {}", username);
+                  debug!("received session initialization from {}", username);
 
                   peer.bytes.get_mut()
                     .write_all(&create_property_request_as_hub()).await?;
                   trace!("sent property request to {}", username);
                 }
                 PROPSET => {
-                  trace!("received property set from {}", username);
+                  debug!("received property set from {}", username);
 
                   peer.bytes.get_mut()
                     .write_all(&Text {
@@ -95,7 +95,7 @@ impl Server for Hub {
                 }
                 BUDDYLISTUPDATE => {
                   let buddy = BuddyList::parse(msg.to_vec());
-                  trace!("received buddy list update from {}: {}", username, buddy.buddy);
+                  debug!("received buddy list update from {}: {}", username, buddy.buddy);
                   peer.bytes.get_mut().write_all(&BuddyList {
                     ..buddy.clone()
                   }.create()).await?;
@@ -104,15 +104,15 @@ impl Server for Hub {
                 // TODO: Figure out if this is actually even needed.
                 // ROOMIDRQ => {
                 //   let room = RoomIdRequest::parse(msg.to_vec());
-                //   trace!("received room id request from {}: {}", username, room.room_name);
-                //   debug!("{:?}", create_room_id_request(&room.room_name, 0x00));
+                //   debug!("received room id request from {}: {}", username, room.room_name);
+                //   trace!("{:?}", create_room_id_request(&room.room_name, 0x00));
                 // }
                 SESSEXIT => {
-                  trace!("received session exit from {}", username); break;
+                  debug!("received session exit from {}", username); break;
                 }
                 TEXT => {
                   let text = Text::parse(msg.to_vec(), &[&username]);
-                  trace!("received text from {}:{}", username, text.content);
+                  debug!("received text from {}:{}", username, text.content);
 
                   {
                     state.lock().await.broadcast(&Text {
@@ -120,21 +120,21 @@ impl Server for Hub {
                       content: text.content,
                     }.create()).await;
                   }
-                  trace!("broadcasted text to hub");
+                  debug!("broadcasted text to hub");
                 }
                 SUBSCRIB => {
                   let subscribe_room = SubscribeRoom::parse(msg[3..].to_vec());
-                  trace!("received subscribe room from {}: {:?}",
+                  debug!("received subscribe room from {}: {:?}",
                     username, subscribe_room);
                 }
                 SUB_DIST => {
                   let subscribe_distance = SubscribeDistance::parse(msg[3..].to_vec());
-                  trace!("received subscribe distance from {}: {:?}",
+                  debug!("received subscribe distance from {}: {:?}",
                     username, subscribe_distance);
                 }
                 TELEPORT => {
                   let teleport = Teleport::parse(msg[3..].to_vec());
-                  trace!("received teleport from {}: {:?}",
+                  debug!("received teleport from {}: {:?}",
                     username, teleport);
                 }
                 _ => (),
@@ -145,18 +145,18 @@ impl Server for Hub {
             error!("error while processing message (s): {}", e); break;
           }
           None => {
-            debug!("nothing"); break;
+            trace!("nothing"); break;
           },
         }
       }
     }
 
     // Deregister client
-    trace!("de-registering client");
+    debug!("de-registering client");
     {
       state.lock().await.peers.remove(&count.to_string());
     }
-    trace!("de-registered client");
+    debug!("de-registered client");
 
     Ok(())
   }
diff --git a/whirl_server/src/lib.rs b/whirl_server/src/lib.rs
index 5a864c7..12080cd 100644
--- a/whirl_server/src/lib.rs
+++ b/whirl_server/src/lib.rs
@@ -65,7 +65,7 @@ pub trait Server {
       counter += 1;
       let state = Arc::clone(&state);
 
-      trace!("accepted client at {}", address);
+      debug!("accepted client at {}", address);
 
       tokio::spawn(async move {
         if let Err(e) = Self::handle(state, stream, address, counter).await {
diff --git a/whirl_server/src/net/converter.rs b/whirl_server/src/net/converter.rs
index 0f2fc07..c976dff 100644
--- a/whirl_server/src/net/converter.rs
+++ b/whirl_server/src/net/converter.rs
@@ -21,13 +21,13 @@ pub fn property_list_to_bytes(
   // Iterate over all network properties
   loop {
     // Check if there are any properties left
-    debug!("props left: {}", property_list.len());
+    trace!("props left: {}", property_list.len());
     if property_list.is_empty() {
       break;
     }
 
     let property = &property_list[0]; // Property we are currently iterating over
-    debug!("current prop: {}:{}", property.prop_id, property.value);
+    trace!("current prop: {}:{}", property.prop_id, property.value);
 
     command.put_u8(property.prop_id as u8); // Property ID
 
diff --git a/whirl_server/src/net/property_parser.rs b/whirl_server/src/net/property_parser.rs
index 5d8a494..f86b767 100644
--- a/whirl_server/src/net/property_parser.rs
+++ b/whirl_server/src/net/property_parser.rs
@@ -16,7 +16,7 @@ pub fn parse_network_property(mut data: Vec<u8>) -> Vec<NetworkProperty> {
     if data.len() <= 2 {
       break;
     }
-    debug!("iteration: {:?}", data);
+    trace!("iteration: {:?}", data);
     // if data[0] == 0 {
     //   break;
     // }
diff --git a/whirl_server/src/packet_parser.rs b/whirl_server/src/packet_parser.rs
index c50569d..bfeba9e 100644
--- a/whirl_server/src/packet_parser.rs
+++ b/whirl_server/src/packet_parser.rs
@@ -12,12 +12,12 @@ use bytes::BytesMut;
 /// 4. Iterate and do this for all commands within `buffer`.
 pub fn parse_commands_from_packet(mut buffer: BytesMut) -> Vec<BytesMut> {
   let mut commands: Vec<BytesMut> = Vec::new();
-  debug!("initial buffer: {:?}, length: {}", buffer, buffer.len());
+  trace!("initial buffer: {:?}, length: {}", buffer, buffer.len());
 
   let data_length = buffer.get(0).unwrap().to_owned() as usize;
   if buffer.len() > data_length {
     loop {
-      debug!("loop: {:?}, length: {}", buffer, buffer.len());
+      trace!("loop: {:?}, length: {}", buffer, buffer.len());
       let command_length = buffer.get(0).unwrap().to_owned() as usize;
       commands.push(BytesMut::from(buffer.get(0..command_length).unwrap()));