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

Fix issue with Web Scheduler crashing Enterprise Server

Browse source
This commit is contained in:
Virtuworks 2013-01-14 17:11:20 -05:00
parent 38938c0902
commit a54c5e1eb8
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,7 @@ using System.IO;
using System.Net;
using System.Collections.Generic;
using System.Text;
using System.Threading;
namespace WebsitePanel.EnterpriseServer
{
@ -166,6 +167,7 @@ namespace WebsitePanel.EnterpriseServer
WebSiteResponse result = new WebSiteResponse();
HttpWebResponse resp = null;
StringBuilder sb = new StringBuilder();
Stream respStream = null;
try
{
WebRequest req = WebRequest.Create(url);
@ -177,7 +179,7 @@ namespace WebsitePanel.EnterpriseServer
}
resp = (HttpWebResponse)req.GetResponse();
Stream respStream = resp.GetResponseStream();
respStream = resp.GetResponseStream();
string charSet = !String.IsNullOrEmpty(resp.CharacterSet) ? resp.CharacterSet : "utf-8";
Encoding encode = System.Text.Encoding.GetEncoding(charSet);
@ -196,6 +198,9 @@ namespace WebsitePanel.EnterpriseServer
result.Status = (int)resp.StatusCode;
result.Text = sb.ToString();
}
catch (ThreadAbortException)
{
}
catch (WebException ex)
{
result.Status = (int)((HttpWebResponse)ex.Response).StatusCode;
@ -210,10 +215,16 @@ namespace WebsitePanel.EnterpriseServer
}
finally
{
if (respStream != null)
{
respStream.Close();
}
if (resp != null)
{
resp.Close();
}
}
return result;