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 2013-04-15 08:23:46 -04:00
commit 5dabcec25f
3 changed files with 53 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
WebsitePanel/Sources/WebsitePanel.Providers.Web.HeliconZoo/HeliconZoo.cs
View file

@ -70,7 +70,17 @@ namespace WebsitePanel.Providers.Web.HeliconZoo
{ {
Configuration appConfig = srvman.GetApplicationHostConfiguration(); Configuration appConfig = srvman.GetApplicationHostConfiguration();
ConfigurationSection heliconZooServer = appConfig.GetSection("system.webServer/heliconZooServer"); ConfigurationSection heliconZooServer;
try
{
heliconZooServer = appConfig.GetSection("system.webServer/heliconZooServer");
}
catch(Exception)
{
// heliconZooServer is not found
// looks like zoo is not installed
return result.ToArray();
}
ConfigurationElement engines = heliconZooServer.GetChildElement("engines"); ConfigurationElement engines = heliconZooServer.GetChildElement("engines");
ConfigurationElementCollection enginesCollection = engines.GetCollection(); ConfigurationElementCollection enginesCollection = engines.GetCollection();
@ -278,7 +288,18 @@ namespace WebsitePanel.Providers.Web.HeliconZoo
using (var srvman = new ServerManager()) using (var srvman = new ServerManager())
{ {
Configuration appConfig = srvman.GetApplicationHostConfiguration(); Configuration appConfig = srvman.GetApplicationHostConfiguration();
ConfigurationSection zooServer = appConfig.GetSection("system.webServer/heliconZooServer", siteId); ConfigurationSection zooServer;
try
{
zooServer = appConfig.GetSection("system.webServer/heliconZooServer", siteId);
}
catch(Exception)
{
// heliconZooServer is not found
// looks like zoo is not installed
return engines.ToArray();
}
ConfigurationElement switchboard = zooServer.GetChildElement("switchboard"); ConfigurationElement switchboard = zooServer.GetChildElement("switchboard");
ConfigurationElementCollection switchboardCollection = switchboard.GetCollection(); ConfigurationElementCollection switchboardCollection = switchboard.GetCollection();

5
WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/IIs70.cs
View file

@ -1914,6 +1914,10 @@ namespace WebsitePanel.Providers.Web
private bool IsHeliconApeEnabled(ServerManager srvman, string siteId) private bool IsHeliconApeEnabled(ServerManager srvman, string siteId)
{ {
if (!string.IsNullOrEmpty(siteId))
{
// Check the web site app pool in integrated pipeline mode
WebSite webSite = null; WebSite webSite = null;
webSite = webObjectsSvc.GetWebSiteFromIIS(srvman, siteId); webSite = webObjectsSvc.GetWebSiteFromIIS(srvman, siteId);
if (webSite == null) if (webSite == null)
@ -1931,6 +1935,7 @@ namespace WebsitePanel.Providers.Web
// Ape is not working in not Integrated pipeline mode // Ape is not working in not Integrated pipeline mode
return false; return false;
} }
}
var appConfig = srvman.GetApplicationHostConfiguration(); var appConfig = srvman.GetApplicationHostConfiguration();

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/HeliconZoo_Settings.ascx
View file

@ -85,6 +85,8 @@ span.ValidationMessageBlock {
</fieldset> </fieldset>
<asp:Panel runat="server" ID="EnginesPanel">
<fieldset> <fieldset>
<legend> <legend>
<span>Helicon Zoo engine quotas settings</span> <span>Helicon Zoo engine quotas settings</span>
@ -94,7 +96,7 @@ span.ValidationMessageBlock {
</div> </div>
</fieldset> </fieldset>
<asp:Panel runat="server" ID="EnginesPanel">
<fieldset> <fieldset>
<legend> <legend>
<span>Engines management</span> <span>Engines management</span>