zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update folder settings timeout fix

Browse source
This commit is contained in:
a.skorina 2014-07-08 16:31:07 +03:00
parent 16fba84240
commit d9d64fe340
2 changed files with 44 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

45
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/EnterpriseStorage/EnterpriseStorageController.cs
View file

@ -48,6 +48,7 @@ using WebsitePanel.Providers.HostedSolution;
using WebsitePanel.EnterpriseServer.Base.HostedSolution; using WebsitePanel.EnterpriseServer.Base.HostedSolution;
using WebsitePanel.Server.Client; using WebsitePanel.Server.Client;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading;
namespace WebsitePanel.EnterpriseServer namespace WebsitePanel.EnterpriseServer
{ {
@ -146,6 +147,11 @@ namespace WebsitePanel.EnterpriseServer
SetFRSMQuotaOnFolderInternal(itemId, folderName, quota, quotaType); SetFRSMQuotaOnFolderInternal(itemId, folderName, quota, quotaType);
} }
public static void StartSetEnterpriseFolderSettingsBackgroundTask(int itemId, SystemFile folder, ESPermission[] permissions, bool directoyBrowsingEnabled, int quota, QuotaType quotaType)
{
StartESBackgroundTaskInternal("SET_ENTERPRISE_FOLDER_SETTINGS", itemId, folder, permissions, directoyBrowsingEnabled, quota, quotaType);
}
#region Directory Browsing #region Directory Browsing
public static bool GetDirectoryBrowseEnabled(int itemId, string siteId) public static bool GetDirectoryBrowseEnabled(int itemId, string siteId)
@ -176,6 +182,41 @@ namespace WebsitePanel.EnterpriseServer
#endregion #endregion
protected static void StartESBackgroundTaskInternal(string taskName, int itemId, SystemFile folder, ESPermission[] permissions, bool directoyBrowsingEnabled, int quota, QuotaType quotaType)
{
// load organization
var org = OrganizationController.GetOrganization(itemId);
new Thread(() =>
{
try
{
TaskManager.StartTask("ENTERPRISE_STORAGE", taskName, org.PackageId);
EnterpriseStorageController.SetDirectoryBrowseEnabled(itemId, folder.Url, directoyBrowsingEnabled);
EnterpriseStorageController.SetFolderPermission(itemId, folder.Name, permissions);
EnterpriseStorageController.SetFRSMQuotaOnFolder(itemId, folder.Name, quota, quotaType);
}
catch (Exception ex)
{
// log error
TaskManager.WriteError(ex, "Error executing enterprise storage background task");
}
finally
{
// complete task
try
{
TaskManager.CompleteTask();
}
catch (Exception)
{
}
}
}).Start();
}
protected static bool CheckUsersDomainExistsInternal(int itemId) protected static bool CheckUsersDomainExistsInternal(int itemId)
{ {
Organization org = OrganizationController.GetOrganization(itemId); Organization org = OrganizationController.GetOrganization(itemId);
@ -524,7 +565,7 @@ namespace WebsitePanel.EnterpriseServer
protected static void SetFRSMQuotaOnFolderInternal(int itemId, string folderName, int quota, QuotaType quotaType) protected static void SetFRSMQuotaOnFolderInternal(int itemId, string folderName, int quota, QuotaType quotaType)
{ {
ResultObject result = TaskManager.StartResultTask<ResultObject>("ENTERPRISE_STORAGE", "CREATE_FOLDER"); ResultObject result = TaskManager.StartResultTask<ResultObject>("ENTERPRISE_STORAGE", "SET_FRSM_QUOTA");
try try
{ {
@ -548,7 +589,7 @@ namespace WebsitePanel.EnterpriseServer
} }
catch (Exception ex) catch (Exception ex)
{ {
result.AddError("ENTERPRISE_STORAGE_CREATE_FOLDER", ex); result.AddError("ENTERPRISE_STORAGE_SET_FRSM_QUOTA", ex);
} }
finally finally
{ {

4
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs
View file

@ -152,9 +152,7 @@ namespace WebsitePanel.EnterpriseServer
[WebMethod] [WebMethod]
public void SetEnterpriseFolderSettings(int itemId, SystemFile folder, ESPermission[] permissions, bool directoyBrowsingEnabled, int quota, QuotaType quotaType) public void SetEnterpriseFolderSettings(int itemId, SystemFile folder, ESPermission[] permissions, bool directoyBrowsingEnabled, int quota, QuotaType quotaType)
{ {
EnterpriseStorageController.SetDirectoryBrowseEnabled(itemId, folder.Url, directoyBrowsingEnabled); EnterpriseStorageController.StartSetEnterpriseFolderSettingsBackgroundTask(itemId, folder, permissions, directoyBrowsingEnabled, quota, quotaType);
EnterpriseStorageController.SetFolderPermission(itemId, folder.Name, permissions);
EnterpriseStorageController.SetFRSMQuotaOnFolder(itemId, folder.Name, quota, quotaType);
} }
#endregion #endregion