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

Updates to delete any existing archived configs during update process to prevent name conflicts

Browse source
This commit is contained in:
Neil Dorin 2019-03-15 12:16:01 -06:00
parent 90bbd65fdc
commit 6235b44d89
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
PepperDashEssentials/AppServer/Messengers/ConfigMessenger.cs
View file

@ -34,7 +34,17 @@ namespace PepperDash.Essentials.AppServer.Messengers
void GetConfigFile(string url) void GetConfigFile(string url)
{ {
url = string.Format("http://{0}/api/system/{1}/config", AppServerController.Config.ServerUrl, AppServerController.SystemUuid); try
{
var parser = new Crestron.SimplSharp.Net.Http.UrlParser(url);
Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully parsed URL from AppServer message: {0}", parser.Url);
}
catch
{
Debug.Console(0, Debug.ErrorLogLevel.Notice, "Unable to parse URL from AppServer message. Generating URL from config data");
url = string.Format("http://{0}/api/system/{1}/config", AppServerController.Config.ServerUrl, AppServerController.SystemUuid);
}
ConfigUpdater.GetConfigFromServer(url); ConfigUpdater.GetConfigFromServer(url);
} }

7
PepperDashEssentials/AppServer/Messengers/SystemMonitorMessenger.cs
View file

@ -40,8 +40,11 @@ namespace PepperDash.Essentials.AppServer.Messengers
/// <param name="e"></param> /// <param name="e"></param>
void ProgramInfoChanged(object sender, ProgramInfoEventArgs e) void ProgramInfoChanged(object sender, ProgramInfoEventArgs e)
{ {
Debug.Console(1, "Posting Status Message: {0}", e.ProgramInfo.ToString()); if (e.ProgramInfo != null)
PostStatusMessage(e.ProgramInfo); {
//Debug.Console(1, "Posting Status Message: {0}", e.ProgramInfo.ToString());
PostStatusMessage(e.ProgramInfo);
}
} }
/// <summary> /// <summary>

2
essentials-framework

@ -1 +1 @@
Subproject commit e1f26dc6e005cf4cd2e2401564dfb61b504f6b72 Subproject commit 1393abd812273e57b2802837331c23be5ccaf5a8