Merge branch 'development-2.0.0' into feature-2.0.0/emergencyOSD

.github/workflows/docker.yml

@@ -58,6 +58,7 @@ jobs:
               $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
             }  
           }   
+                   
           echo "version=$newVersionString" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
       - name: Setup MS Build
         uses: microsoft/setup-msbuild@v1.1
@@ -69,16 +70,13 @@ jobs:
       - name: Pack Solution
         run: dotnet pack .\$($Env:SOLUTION_FILE).sln --configuration $env:BUILD_TYPE --output ./output /p:Version="${{ steps.setVersion.outputs.version }}"
       - name: Create tag for non-rc builds
-        if: contains(steps.setVersion.outputs.version, 'alpha')
+        if: ${{ !contains(steps.setVersion.outputs.version, 'rc') }}
         run: |
           git tag ${{ steps.setVersion.outputs.version }}
           git push --tags origin
       # Create the release on the source repo
       - name: Create Release
         id: create_release
-#        if: contains(steps.setVersion.outputs.version,'-rc-') ||
-#            contains(steps.setVersion.outputs.version,'-hotfix-') ||
-#            contains(steps.setVersion.outputs.version, '-beta-')
         uses: ncipollo/release-action@v1
         with:
           artifacts: 'output\**\*.*(cpz|cplz)'

src/PepperDash.Essentials.Core/Routing/Extensions.cs

@@ -61,9 +61,10 @@ namespace PepperDash.Essentials.Core
                 SignalType = signalType
             };
 
-            var coolingDevice = destination as IWarmingCooling;
             
 
+            var coolingDevice = destination as IWarmingCooling;
+
             //We already have a route request for this device, and it's a cooling device and is cooling
             if (RouteRequests.TryGetValue(destination.Key, out RouteRequest existingRouteRequest) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
             {                
@@ -81,8 +82,6 @@ namespace PepperDash.Essentials.Core
             //New Request
             if (coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
             {               
-                coolingDevice.IsCoolingDownFeedback.OutputChange -= routeRequest.HandleCooldown;
-
                 coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
 
                 RouteRequests.Add(destination.Key, routeRequest);
@@ -93,7 +92,12 @@ namespace PepperDash.Essentials.Core
 
             if (RouteRequests.ContainsKey(destination.Key) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == false)
             {
+                var handledRequest = RouteRequests[destination.Key];
+
+                coolingDevice.IsCoolingDownFeedback.OutputChange -= handledRequest.HandleCooldown;
+
                 RouteRequests.Remove(destination.Key);
+
                 Debug.LogMessage(LogEventLevel.Information, "Device: {destination} is NOT cooling down.  Removing stored route request and routing to source key: {sourceKey}", null, destination.Key, routeRequest.Source.Key);
             }
 

src/PepperDash.Essentials.Core/Routing/RouteDescriptor.cs

@@ -77,8 +77,6 @@ namespace PepperDash.Essentials.Core
                         continue;
                     }
 
-                    switchingDevice.ExecuteSwitch(null, route.OutputPort.Selector, SignalType);
-
                     if (route.OutputPort.InUseTracker != null)
                     {
                         route.OutputPort.InUseTracker.RemoveUser(Destination, "destination-" + SignalType);

src/PepperDash.Essentials.Core/Routing/RouteRequest.cs

@@ -1,5 +1,6 @@
 using PepperDash.Core;
 using Serilog.Events;
+using System;
 
 namespace PepperDash.Essentials.Core
 {
@@ -14,14 +15,17 @@ namespace PepperDash.Essentials.Core
 
         public void HandleCooldown(object sender, FeedbackEventArgs args)
         {
-            Debug.LogMessage(LogEventLevel.Information, "Handling cooldown route request: {destination}:{destinationPort} -> {source}:{sourcePort} {type}", null, Destination.Key, DestinationPort.Key, Source.Key, SourcePort.Key, SignalType.ToString());
+            try
+            {
+                Debug.LogMessage(LogEventLevel.Information, "Handling cooldown route request: {destination}:{destinationPort} -> {source}:{sourcePort} {type}", null, Destination?.Key ?? "empty destination", DestinationPort?.Key ?? "no destination port", Source?.Key ?? "empty source", SourcePort?.Key ?? "empty source port", SignalType.ToString());
 
                 if (args.BoolValue == true)
                 {
                     return;
                 }
 
-            Debug.LogMessage(LogEventLevel.Information, "Cooldown complete. Making route from {destination} to {source}", Destination.Key, Source.Key);
+                Debug.LogMessage(LogEventLevel.Information, "Cooldown complete. Making route from {destination} to {source}", Destination?.Key, Source?.Key);
+
                 Destination.ReleaseAndMakeRoute(Source, SignalType, DestinationPort?.Key ?? string.Empty, SourcePort?.Key ?? string.Empty);
 
                 if (sender is IWarmingCooling coolingDevice)
@@ -29,6 +33,10 @@ namespace PepperDash.Essentials.Core
                     Debug.LogMessage(LogEventLevel.Debug, "Unsubscribing from cooling feedback for {destination}", null, Destination.Key);
                     coolingDevice.IsCoolingDownFeedback.OutputChange -= HandleCooldown;
                 }
+            } catch(Exception ex)
+            {
+                Debug.LogMessage(ex, "Exception handling cooldown", Destination);
+            }
         }
     }
 }