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

feat: adds more api handlers to load config and get/set min log level

Browse Source
This commit is contained in:
Neil Dorin
2023-11-24 18:58:11 -07:00
parent d2877f2cec
commit a2c628145d
8 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/PepperDash.Essentials.Core/Config/ILoadConfig.cs Normal file
View File

@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PepperDash.Essentials.Core
{
public interface ILoadConfig
{
void GoWithLoad();
}
}

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

@@ -26,7 +26,7 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.2"> <PackageReference Include="Newtonsoft.Json" Version="13.0.2">
<Aliases>Full</Aliases> <Aliases>Full</Aliases>
</PackageReference> </PackageReference>
<PackageReference Include="PepperDashCore" Version="2.0.0-alpha-373" /> <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-374" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Crestron\CrestronGenericBaseDevice.cs.orig" /> <None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />

2
src/PepperDash.Essentials.Core/Web/EssentialsWebApi.cs
View File

@@ -163,7 +163,7 @@ namespace PepperDash.Essentials.Core.Web
new HttpCwsRoute("loadConfig") new HttpCwsRoute("loadConfig")
{ {
Name = "Load Config", Name = "Load Config",
RouteHandler = new RestartProgramRequestHandler() RouteHandler = new LoadConfigRequestHandler()
} }
}; };

8
src/PepperDash.Essentials.Core/Web/RequestHandlers/AppDebugRequestHandler.cs
View File

@@ -2,6 +2,8 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using PepperDash.Core; using PepperDash.Core;
using PepperDash.Core.Web.RequestHandlers; using PepperDash.Core.Web.RequestHandlers;
using System;
using Serilog.Events;
namespace PepperDash.Essentials.Core.Web.RequestHandlers namespace PepperDash.Essentials.Core.Web.RequestHandlers
{ {
@@ -26,7 +28,7 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
{ {
var appDebug = new AppDebug { MinimumLevel = Debug.WebsocketMinimumLogLevel }; var appDebug = new AppDebug { MinimumLevel = Debug.WebsocketMinimumLogLevel };
var body = JsonConvert.SerializeObject(appDebug, Formatting.Indented); var body = JsonConvert.SerializeObject((appDebug, Formatting.Indented, new JsonSerializerSettings( ));
context.Response.StatusCode = 200; context.Response.StatusCode = 200;
context.Response.StatusDescription = "OK"; context.Response.StatusDescription = "OK";
@@ -60,7 +62,7 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
} }
var appDebug = new AppDebug(); var appDebug = new AppDebug();
var requestBody = JsonConvert.DeserializeAnonymousType(data, appDebug); var requestBody = JsonConvert.DeserializeObject<AppDebug>(data);
Debug.SetWebSocketMinimumDebugLevel(requestBody.MinimumLevel); Debug.SetWebSocketMinimumDebugLevel(requestBody.MinimumLevel);
@@ -77,6 +79,6 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
public class AppDebug public class AppDebug
{ {
[JsonProperty("minimumLevel", NullValueHandling = NullValueHandling.Ignore)] [JsonProperty("minimumLevel", NullValueHandling = NullValueHandling.Ignore)]
public Serilog.Events.LogEventLevel MinimumLevel { get; set; } public LogEventLevel MinimumLevel { get; set; }
} }
} }

6
src/PepperDash.Essentials.Core/Web/RequestHandlers/LoadConfigRequestHandler.cs
View File

@@ -26,8 +26,10 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
protected override void HandlePost(HttpCwsContext context) protected override void HandlePost(HttpCwsContext context)
{ {
var message = ""; var message = "";
//Global.ControlSystem.GoWithLoad(); var cs = Global.ControlSystem as ILoadConfig;
if(cs != null)
cs.GoWithLoad();
context.Response.StatusCode = 200; context.Response.StatusCode = 200;
context.Response.StatusDescription = "OK"; context.Response.StatusDescription = "OK";
context.Response.Write(message, false); context.Response.Write(message, false);

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

@@ -31,6 +31,6 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.2"> <PackageReference Include="Newtonsoft.Json" Version="13.0.2">
<Aliases>Full</Aliases> <Aliases>Full</Aliases>
</PackageReference> </PackageReference>
<PackageReference Include="PepperDashCore" Version="2.0.0-alpha-373" /> <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-374" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@@ -18,7 +18,7 @@ using System.Linq;
namespace PepperDash.Essentials namespace PepperDash.Essentials
{ {
public class ControlSystem : CrestronControlSystem public class ControlSystem : CrestronControlSystem, ILoadConfig
{ {
HttpLogoServer LogoServer; HttpLogoServer LogoServer;

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

@@ -51,7 +51,7 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.2"> <PackageReference Include="Newtonsoft.Json" Version="13.0.2">
<Aliases>Full</Aliases> <Aliases>Full</Aliases>
</PackageReference> </PackageReference>
<PackageReference Include="PepperDashCore" Version="2.0.0-alpha-373" /> <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-374" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" /> <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />