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

Merge

Browse source
This commit is contained in:
Virtuworks 2014-12-29 17:01:34 -05:00
commit 112b3437a8
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/CalculatePackagesDiskspaceTask.cs
View file

@ -200,11 +200,14 @@ namespace WebsitePanel.EnterpriseServer
//TaskManager.Write(String.Format("{0} - Invoke GetServiceItemsDiskSpace method ('{1}' items) - {2} attempt", //TaskManager.Write(String.Format("{0} - Invoke GetServiceItemsDiskSpace method ('{1}' items) - {2} attempt",
// DateTime.Now, objItems.Count, attempt)); // DateTime.Now, objItems.Count, attempt));
ServiceProvider prov = new ServiceProvider(); if (objItems.Count > 0)
ServiceProviderProxy.Init(prov, serviceId); {
ServiceProviderItemDiskSpace[] itemsDiskSpace = prov.GetServiceItemsDiskSpace(objItems.ToArray()); ServiceProvider prov = new ServiceProvider();
if (itemsDiskSpace != null && itemsDiskSpace.Length > 0) ServiceProviderProxy.Init(prov, serviceId);
organizationDiskSpaces.AddRange(itemsDiskSpace); ServiceProviderItemDiskSpace[] itemsDiskSpace = prov.GetServiceItemsDiskSpace(objItems.ToArray());
if (itemsDiskSpace != null && itemsDiskSpace.Length > 0)
organizationDiskSpaces.AddRange(itemsDiskSpace);
}
return organizationDiskSpaces.ToArray(); return organizationDiskSpaces.ToArray();
} }

2
WebsitePanel/Sources/WebsitePanel.Server/ServiceProvider.asmx.cs
View file

@ -160,6 +160,8 @@ namespace WebsitePanel.Server
try try
{ {
Log.WriteStart("'{0}' GetServiceItemsDiskSpace", ProviderSettings.ProviderName); Log.WriteStart("'{0}' GetServiceItemsDiskSpace", ProviderSettings.ProviderName);
if (items.Length == 0) return new ServiceProviderItemDiskSpace[] {};
return Provider.GetServiceItemsDiskSpace(UnwrapServiceProviderItems(items)); return Provider.GetServiceItemsDiskSpace(UnwrapServiceProviderItems(items));
} }
catch (Exception ex) catch (Exception ex)