jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove localhost-only requirement for post upgrade maintenance

Browse Source
This commit is contained in:
Gary Sharp
2023-11-09 13:43:51 +11:00
parent 7b6a44921d
commit 028d1ccc64
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Plugins/UpdatePluginsAfterDiscoUpdateTask.cs
+3 -3
View File
@@ -16,10 +16,10 @@ namespace Disco.Services.Plugins
{ {
Status.UpdateStatus(0, "Updating plugins after Disco ICT update", "Starting, please wait..."); Status.UpdateStatus(0, "Updating plugins after Disco ICT update", "Starting, please wait...");
// Wait for App to Load (10 Seconds) // Wait for App to Load (3 Seconds)
for (int i = 0; i < 10; i++) for (int i = 0; i < 3; i++)
{ {
Status.UpdateStatus(10 * i); Status.UpdateStatus(33 * i);
System.Threading.Thread.Sleep(1000); System.Threading.Thread.Sleep(1000);
} }
Disco.Web/Controllers/UpdateController.cs
-15
View File
@@ -1,6 +1,4 @@
using Disco.Services.Plugins; using Disco.Services.Plugins;
using System;
using System.Configuration;
using System.Web.Mvc; using System.Web.Mvc;
namespace Disco.Web.Controllers namespace Disco.Web.Controllers
@@ -8,19 +6,6 @@ namespace Disco.Web.Controllers
[OutputCache(Duration = 0, Location = System.Web.UI.OutputCacheLocation.None)] [OutputCache(Duration = 0, Location = System.Web.UI.OutputCacheLocation.None)]
public partial class UpdateController : Controller public partial class UpdateController : Controller
{ {
protected override void OnActionExecuting(ActionExecutingContext filterContext)
{
if (!Request.IsLocal && !InitialConfigController.ServerIsCoreSKU.Value && !("true".Equals(ConfigurationManager.AppSettings["DiscoIgnoreVersionUpdate"], StringComparison.OrdinalIgnoreCase)))
{
filterContext.Result = new ContentResult()
{
Content = "Maintenance of Disco ICT is only allowed via a localhost connection",
ContentType = "text/plain"
};
}
base.OnActionExecuting(filterContext);
}
public virtual ActionResult Index() public virtual ActionResult Index()
{ {
var status = UpdatePluginsAfterDiscoUpdateTask.UpdateDiscoPlugins(true); var status = UpdatePluginsAfterDiscoUpdateTask.UpdateDiscoPlugins(true);