Update loggers

project-fika · May 6, 2024 · 5421dea · 5421dea
1 parent 6bd3924
commit 5421dea
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git a/Fika.Core/AkiSupport/Airdrops/Utils/FikaItemFactoryUtil.cs b/Fika.Core/AkiSupport/Airdrops/Utils/FikaItemFactoryUtil.cs
@@ -19,7 +19,7 @@ public class FikaItemFactoryUtil
         public FikaItemFactoryUtil()
         {
             itemFactory = Singleton<ItemFactory>.Instance;
-            logSource = new("ItemFactoryUtil");
+            logSource = Logger.CreateLogSource("ItemFactoryUtil");
         }
 
         public void BuildContainer(LootableContainer container, FikaAirdropConfigModel config, string dropType)

diff --git a/Fika.Core/Coop/BTR/FikaBTRManager_Client.cs b/Fika.Core/Coop/BTR/FikaBTRManager_Client.cs
@@ -61,7 +61,7 @@ internal class FikaBTRManager_Client : MonoBehaviour
             Type btrControllerType = typeof(BTRControllerClass);
             _updateTaxiPriceMethod = AccessTools.GetDeclaredMethods(btrControllerType).Single(IsUpdateTaxiPriceMethod);
             client = Singleton<FikaClient>.Instance;
-            btrLogger = new("BTR Client");
+            btrLogger = BepInEx.Logging.Logger.CreateLogSource("BTR Client");
         }
 
         private void Awake()

diff --git a/Fika.Core/Coop/BTR/FikaBTRManager_Host.cs b/Fika.Core/Coop/BTR/FikaBTRManager_Host.cs
@@ -71,7 +71,7 @@ internal class FikaBTRManager_Host : MonoBehaviour
             Type btrControllerType = typeof(BTRControllerClass);
             _updateTaxiPriceMethod = AccessTools.GetDeclaredMethods(btrControllerType).Single(IsUpdateTaxiPriceMethod);
             server = Singleton<FikaServer>.Instance;
-            btrLogger = new("BTR Host");
+            btrLogger = BepInEx.Logging.Logger.CreateLogSource("BTR Host");
         }
 
         public bool CanPlayerEnter(IPlayer player)

diff --git a/Fika.Core/Coop/PacketHandlers/ServerPacketSender.cs b/Fika.Core/Coop/PacketHandlers/ServerPacketSender.cs
@@ -35,7 +35,7 @@ public class ServerPacketSender : MonoBehaviour, IPacketSender
 
         private void Awake()
         {
-            logger = new("ServerPacketSender");
+            logger = BepInEx.Logging.Logger.CreateLogSource("ServerPacketSender");
             player = GetComponent<CoopPlayer>();
         }
 

diff --git a/Fika.Core/Networking/FikaClient.cs b/Fika.Core/Networking/FikaClient.cs
@@ -52,12 +52,11 @@ public NetManager NetClient
         public string IP { get; private set; }
         public int Port { get; private set; }
         public bool SpawnPointsReceived { get; private set; } = false;
-        private ManualLogSource clientLogger;
+        private readonly ManualLogSource clientLogger = BepInEx.Logging.Logger.CreateLogSource("Fika.Client");
         public bool ClientReady = false;
 
         protected void Start()
         {
-            clientLogger = new("Fika Client");
 
             packetProcessor.SubscribeNetSerializable<PlayerStatePacket, NetPeer>(OnPlayerStatePacketReceived);
             packetProcessor.SubscribeNetSerializable<GameTimerPacket, NetPeer>(OnGameTimerPacketReceived);

diff --git a/Fika.Core/Networking/FikaPingingClient.cs b/Fika.Core/Networking/FikaPingingClient.cs
@@ -11,7 +11,7 @@ namespace Fika.Core.Networking
     internal class FikaPingingClient(string serverId) : INetEventListener
     {
         public NetManager NetClient;
-        private readonly ManualLogSource _logger = new("Pinging Client");
+        private readonly ManualLogSource _logger = Logger.CreateLogSource("Fika.PingingClient");
         private readonly string serverId = serverId;
         private IPEndPoint remoteEndPoint;
         public bool Received = false;
@@ -58,8 +58,7 @@ public bool PingEndPoint()
             NetDataWriter writer = new();
             writer.Put("fika.hello");
 
-            bool success = NetClient.SendUnconnectedMessage(writer, remoteEndPoint);
-            return success;
+            return NetClient.SendUnconnectedMessage(writer, remoteEndPoint);
         }
 
         public void OnConnectionRequest(ConnectionRequest request)
@@ -84,7 +83,12 @@ public void OnNetworkReceive(NetPeer peer, NetPacketReader reader, byte channelN
 
         public void OnNetworkReceiveUnconnected(IPEndPoint remoteEndPoint, NetPacketReader reader, UnconnectedMessageType messageType)
         {
+            if (Received)
+            {
+                return;
+            }
             _logger.LogInfo("Received response from server, parsing...");
+
             if (reader.TryGetString(out string result))
             {
                 if (result == "fika.hello")

diff --git a/Fika.Core/Networking/FikaServer.cs b/Fika.Core/Networking/FikaServer.cs
@@ -51,7 +51,7 @@ public NetManager NetServer
         }
         public DateTime timeSinceLastPeerDisconnected = DateTime.Now.AddDays(1);
         public bool hasHadPeer = false;
-        private readonly ManualLogSource serverLogger = new("Fika Server");
+        private readonly ManualLogSource serverLogger = BepInEx.Logging.Logger.CreateLogSource("Fika.Server");
         public bool ServerReady = false;
         private int _currentNetId;
 

diff --git a/Fika.Core/UI/Custom/MatchMakerUIScript.cs b/Fika.Core/UI/Custom/MatchMakerUIScript.cs
@@ -163,7 +163,7 @@ private IEnumerator JoinMatch(string profileId, string serverId, Button button)
                         success = pingingClient.Received;
                     }
                     yield return new WaitForFixedUpdate();
-                } while (attempts < 5 && !success);
+                } while (!success && attempts < 5);
 
                 if (!success)
                 {