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

wsp-10323 fix job progress

Browse source
This commit is contained in:
me 2015-03-30 20:33:18 +04:00
parent aeec78ac02
commit 639e6600c0
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization/VirtualizationServerController.cs
View file

@ -612,6 +612,7 @@ namespace WebsitePanel.EnterpriseServer
#region Setup External network #region Setup External network
TaskManager.Write("VPS_CREATE_SETUP_EXTERNAL_NETWORK"); TaskManager.Write("VPS_CREATE_SETUP_EXTERNAL_NETWORK");
TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress
try try
{ {
@ -644,6 +645,7 @@ namespace WebsitePanel.EnterpriseServer
#region Setup Management network #region Setup Management network
TaskManager.Write("VPS_CREATE_SETUP_MANAGEMENT_NETWORK"); TaskManager.Write("VPS_CREATE_SETUP_MANAGEMENT_NETWORK");
TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress
try try
{ {
@ -704,6 +706,7 @@ namespace WebsitePanel.EnterpriseServer
#region Setup Private network #region Setup Private network
TaskManager.Write("VPS_CREATE_SETUP_PRIVATE_NETWORK"); TaskManager.Write("VPS_CREATE_SETUP_PRIVATE_NETWORK");
TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress
try try
{ {
@ -759,6 +762,7 @@ namespace WebsitePanel.EnterpriseServer
TaskManager.Write("VPS_CREATE_CONVERT_VHD"); TaskManager.Write("VPS_CREATE_CONVERT_VHD");
TaskManager.Write("VPS_CREATE_CONVERT_SOURCE_VHD", vm.OperatingSystemTemplatePath); TaskManager.Write("VPS_CREATE_CONVERT_SOURCE_VHD", vm.OperatingSystemTemplatePath);
TaskManager.Write("VPS_CREATE_CONVERT_DEST_VHD", vm.VirtualHardDrivePath); TaskManager.Write("VPS_CREATE_CONVERT_DEST_VHD", vm.VirtualHardDrivePath);
TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress
try try
{ {
// convert VHD // convert VHD
@ -817,6 +821,7 @@ namespace WebsitePanel.EnterpriseServer
if (vm.HddSize > hddSizeGB) if (vm.HddSize > hddSizeGB)
{ {
TaskManager.Write("VPS_CREATE_EXPAND_VHD"); TaskManager.Write("VPS_CREATE_EXPAND_VHD");
TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress
// expand VHD // expand VHD
try try
@ -958,6 +963,7 @@ namespace WebsitePanel.EnterpriseServer
TaskManager.Write("VPS_CREATE_CPU_CORES", vm.CpuCores.ToString()); TaskManager.Write("VPS_CREATE_CPU_CORES", vm.CpuCores.ToString());
TaskManager.Write("VPS_CREATE_RAM_SIZE", vm.RamSize.ToString()); TaskManager.Write("VPS_CREATE_RAM_SIZE", vm.RamSize.ToString());
TaskManager.Write("VPS_CREATE_CREATE_VM"); TaskManager.Write("VPS_CREATE_CREATE_VM");
TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress
// create virtual machine // create virtual machine
try try
{ {
@ -1031,6 +1037,7 @@ namespace WebsitePanel.EnterpriseServer
#region Start VPS #region Start VPS
TaskManager.Write("VPS_CREATE_START_VPS"); TaskManager.Write("VPS_CREATE_START_VPS");
TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress
try try
{ {

5
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/ServerTabs.ascx.cs
View file

@ -214,6 +214,10 @@ namespace WebsitePanel.Portal.VPS.UserControls
// gauge // gauge
gauge.Visible = false; gauge.Visible = false;
if (e.Item.ItemIndex == task.GetLogs().Count - 1) if (e.Item.ItemIndex == task.GetLogs().Count - 1)
{
if (task.IndicatorCurrent == -1)
litRecord.Text += "...";
else
{ {
gauge.Visible = true; gauge.Visible = true;
gauge.Total = task.IndicatorMaximum; gauge.Total = task.IndicatorMaximum;
@ -223,3 +227,4 @@ namespace WebsitePanel.Portal.VPS.UserControls
} }
} }
} }
}