pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-09 09:45:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1186 from PepperDash/feature-2.0.0/logging-updates

Browse Source 
Update PD Core & Crestron Packages
This commit is contained in:
Joshua_Gutenplan
2024-05-15 22:45:04 -07:00
committed by GitHub
parent bc67a4382b 5820c9d282
commit a95d44e405
6 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/PepperDash.Essentials.Core/Comm and IR/GenericHttpClient.cs
View File

@@ -5,7 +5,6 @@ using System.Text;
using Crestron.SimplSharp;
using Crestron.SimplSharp.Net.Http;
using PepperDash.Core;
using PepperDash.Core.DebugThings;
namespace PepperDash.Essentials.Core
{

4
src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
View File

@@ -22,8 +22,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.42" />
<PackageReference Include="PepperDashCore" Version="2.0.0-alpha-402" />
<PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.66" />
<PackageReference Include="PepperDashCore" Version="2.0.0-beta-415" />
</ItemGroup>
<ItemGroup>
<None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />

15
src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs
View File

@@ -6,6 +6,7 @@ using Crestron.SimplSharpPro.DeviceSupport;
using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Bridges;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.DeviceTypeInterfaces;
using PepperDash.Essentials.Core.Routing;
using Serilog.Events;
@@ -251,4 +252,18 @@ namespace PepperDash.Essentials.Devices.Common.Displays
}
public class MockDisplayFactory : EssentialsDeviceFactory<MockDisplay>
{
public MockDisplayFactory()
{
TypeNames = new List<string>() { "mockdisplay2" };
}
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Mock Display Device");
return new MockDisplay(dc.Key, dc.Name);
}
}
}

4
src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
View File

@@ -26,7 +26,7 @@
<ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.42" />
<PackageReference Include="PepperDashCore" Version="2.0.0-alpha-402" />
<PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.66" />
<PackageReference Include="PepperDashCore" Version="2.0.0-beta-415" />
</ItemGroup>
</Project>

10
src/PepperDash.Essentials/ControlSystem.cs
View File

@@ -34,6 +34,8 @@ namespace PepperDash.Essentials
SecretsManager.Initialize();
SystemMonitor.ProgramInitialization.ProgramInitializationUnderUserControl = true;
Debug.SetErrorLogMinimumDebugLevel(CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? LogEventLevel.Warning : LogEventLevel.Verbose);
// AppDomain.CurrentDomain.AssemblyResolve += CurrentDomainOnAssemblyResolve;
}
@@ -162,7 +164,7 @@ namespace PepperDash.Essentials
{
try
{
Debug.LogMessage(LogEventLevel.Information, "Determining Platform...");
Debug.LogMessage(LogEventLevel.Information, "Determining Platform...");
string filePathPrefix;
@@ -240,7 +242,7 @@ namespace PepperDash.Essentials
}
catch (Exception e)
{
Debug.LogMessage(LogEventLevel.Error, "Unable to determin platform due to exception: {exception}", e.Message);
Debug.LogMessage(e, "Unable to determine platform due to exception");
}
}
@@ -296,7 +298,7 @@ namespace PepperDash.Essentials
}
catch (Exception e)
{
Debug.LogMessage(LogEventLevel.Information, "FATAL INITIALIZE ERROR. System is in an inconsistent state: {exception}", e);
Debug.LogMessage(e, "FATAL INITIALIZE ERROR. System is in an inconsistent state");
}
finally
{
@@ -428,7 +430,7 @@ namespace PepperDash.Essentials
}
catch (Exception e)
{
Debug.LogMessage(LogEventLevel.Information, "ERROR: Creating device {deviceKey:l}. Skipping device. \r\n{exception}", devConf.Key, e);
Debug.LogMessage(e, "ERROR: Creating device {deviceKey:l}. Skipping device.",args: new[] { devConf.Key });
}
}
Debug.LogMessage(LogEventLevel.Information, "All Devices Loaded.");

4
src/PepperDash.Essentials/PepperDash.Essentials.csproj
View File

@@ -46,8 +46,8 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.20.42" />
<PackageReference Include="PepperDashCore" Version="2.0.0-alpha-402" />
<PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.20.66" />
<PackageReference Include="PepperDashCore" Version="2.0.0-beta-415" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />