Merge pull request #32 from davewalker5/BSR-54-Simulator-Log-Size

Reduce simulator log size
davewalker5 · Sep 22, 2023 · 6d4d10e · 6d4d10e
2 parents 0489cea + fb4252c
commit 6d4d10e
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/src/BaseStationReader.Data/BaseStationReader.Data.csproj b/src/BaseStationReader.Data/BaseStationReader.Data.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>BaseStationReader.Data</PackageId>
-    <PackageVersion>1.23.0.0</PackageVersion>
+    <PackageVersion>1.24.0.0</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) Dave Walker 2023</Copyright>
     <Owners>Dave Walker</Owners>
@@ -17,7 +17,7 @@
     <PackageProjectUrl>https://github.com/davewalker5/ADS-B-BaseStationReader</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <ReleaseVersion>1.23.0.0</ReleaseVersion>
+    <ReleaseVersion>1.24.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/BaseStationReader.Entities/BaseStationReader.Entities.csproj b/src/BaseStationReader.Entities/BaseStationReader.Entities.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>BaseStationReader.Entities</PackageId>
-    <PackageVersion>1.23.0.0</PackageVersion>
+    <PackageVersion>1.24.0.0</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) Dave Walker 2023</Copyright>
     <Owners>Dave Walker</Owners>
@@ -17,7 +17,7 @@
     <PackageProjectUrl>https://github.com/davewalker5/ADS-B-BaseStationReader</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <ReleaseVersion>1.23.0.0</ReleaseVersion>
+    <ReleaseVersion>1.24.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/BaseStationReader.Logic/BaseStationReader.Logic.csproj b/src/BaseStationReader.Logic/BaseStationReader.Logic.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>BaseStationReader.Logic</PackageId>
-    <PackageVersion>1.23.0.0</PackageVersion>
+    <PackageVersion>1.24.0.0</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) Dave Walker 2023</Copyright>
     <Owners>Dave Walker</Owners>
@@ -17,7 +17,7 @@
     <PackageProjectUrl>https://github.com/davewalker5/ADS-B-BaseStationReader</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <ReleaseVersion>1.23.0.0</ReleaseVersion>
+    <ReleaseVersion>1.24.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/BaseStationReader.Logic/Simulator/IdentificationMessageGenerator.cs b/src/BaseStationReader.Logic/Simulator/IdentificationMessageGenerator.cs
@@ -20,7 +20,7 @@ public IdentificationMessageGenerator(ITrackerLogger logger) : base(logger)
         public Message Generate(string address, string? callsign, string? squawk)
         {
             // Generate the base message and populate the type-specific members
-            var message = base.ConstructMessage(TransmissionType.Identification, address);
+            var message = ConstructMessage(TransmissionType.Identification, address);
             message.Callsign = callsign;
 
             // Log and return the message

diff --git a/src/BaseStationReader.Logic/Simulator/MsgMessageGeneratorBase.cs b/src/BaseStationReader.Logic/Simulator/MsgMessageGeneratorBase.cs
@@ -9,7 +9,7 @@ public abstract class MsgMessageGeneratorBase
         protected readonly Random _random = new();
         private readonly ITrackerLogger _logger;
 
-        public MsgMessageGeneratorBase(ITrackerLogger logger)
+        protected MsgMessageGeneratorBase(ITrackerLogger logger)
         {
             _logger = logger;
         }
@@ -30,7 +30,7 @@ protected int RandomInt(int minValue, int maxValue)
         /// </summary>
         /// <param name="address"></param>
         /// <returns></returns>
-        protected Message ConstructMessage(TransmissionType type, string address)
+        protected static Message ConstructMessage(TransmissionType type, string address)
         {
             Message message = new()
             {
@@ -54,7 +54,7 @@ protected Message ConstructMessage(TransmissionType type, string address)
         protected void LogGeneratedMessage(Message message)
         {
             _logger.LogMessage(
-                Severity.Info,
+                Severity.Debug,
                 $"Generated MSG {(int)message.TransmissionType} ({message.TransmissionType.ToString()}) message");
         }
     }

diff --git a/src/BaseStationReader.Logic/Simulator/ReceiverSimulator.cs b/src/BaseStationReader.Logic/Simulator/ReceiverSimulator.cs
@@ -137,7 +137,7 @@ private void RemoveExpiredAircraft()
 
             // Compile a list of aircraft to be removed
             var expired = _aircraft.Where(x => x.FirstSeen < cutoff).Select(x => x.Address);
-            if (expired.Count() > 0)
+            if (expired.Any())
             {
                 // Log the removal and remove them
                 var addresses = string.Join(',', expired);
@@ -188,7 +188,7 @@ private byte[] GenerateMessage()
 
             // Log it in Base Station format
             var basestation = message.ToBaseStation();
-            _logger.LogMessage(Severity.Info, basestation);
+            _logger.LogMessage(Severity.Debug, basestation);
 
             // Generate a byte array representing the message in BaseStation format
             var messageBytes = Encoding.UTF8.GetBytes($"{basestation}\r\n");

diff --git a/src/BaseStationReader.Simulator/BaseStationReader.Simulator.csproj b/src/BaseStationReader.Simulator/BaseStationReader.Simulator.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
-    <ReleaseVersion>1.23.0.0</ReleaseVersion>
-    <FileVersion>1.23.0.0</FileVersion>
-    <ProductVersion>1.23.0</ProductVersion>
+    <ReleaseVersion>1.24.0.0</ReleaseVersion>
+    <FileVersion>1.24.0.0</FileVersion>
+    <ProductVersion>1.24.0</ProductVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/BaseStationReader.Terminal/BaseStationReader.Terminal.csproj b/src/BaseStationReader.Terminal/BaseStationReader.Terminal.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
-    <ReleaseVersion>1.23.0.0</ReleaseVersion>
-    <FileVersion>1.23.0.0</FileVersion>
-    <ProductVersion>1.23.0</ProductVersion>
+    <ReleaseVersion>1.24.0.0</ReleaseVersion>
+    <FileVersion>1.24.0.0</FileVersion>
+    <ProductVersion>1.24.0</ProductVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/BaseStationReader.UI/BaseStationReader.UI.csproj b/src/BaseStationReader.UI/BaseStationReader.UI.csproj
@@ -2,9 +2,9 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
-    <ReleaseVersion>1.23.0.0</ReleaseVersion>
-    <FileVersion>1.23.0.0</FileVersion>
-    <ProductVersion>1.23.0</ProductVersion>
+    <ReleaseVersion>1.24.0.0</ReleaseVersion>
+    <FileVersion>1.24.0.0</FileVersion>
+    <ProductVersion>1.24.0</ProductVersion>
     <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>