lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-25 19:17:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Updating Warmup UI

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-06-03 17:44:46 -07:00
parent 2dda95fbf4
commit a605420d11
16 changed files with 416 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
src/Orchard.Web/Modules/Orchard.Warmup/Services/WarmupUpdater.cs
View File

@@ -1,9 +1,11 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Web;
using System.Xml;
using Orchard.ContentManagement;
using Orchard.Environment.Configuration;
using Orchard.Environment.Warmup;
using Orchard.FileSystems.AppData;
using Orchard.FileSystems.LockFile;
@@ -18,8 +20,11 @@ namespace Orchard.Warmup.Services {
private readonly IClock _clock;
private readonly IAppDataFolder _appDataFolder;
private readonly IWebDownloader _webDownloader;
private readonly IWarmupReportManager _reportManager;
private const string BaseFolder = "Warmup";
private const string WarmupFilename = "warmup.txt";
private readonly string _warmupPath;
private readonly string _lockFilename;
public WarmupUpdater(
@@ -27,13 +32,18 @@ namespace Orchard.Warmup.Services {
ILockFileManager lockFileManager,
IClock clock,
IAppDataFolder appDataFolder,
IWebDownloader webDownloader) {
IWebDownloader webDownloader,
IWarmupReportManager reportManager,
ShellSettings shellSettings) {
_orchardServices = orchardServices;
_lockFileManager = lockFileManager;
_clock = clock;
_appDataFolder = appDataFolder;
_webDownloader = webDownloader;
_lockFilename = _appDataFolder.Combine(BaseFolder, WarmupFilename + ".lock");
_reportManager = reportManager;
_lockFilename = _appDataFolder.Combine("Sites", _appDataFolder.Combine(shellSettings.Name, WarmupFilename + ".lock"));
_warmupPath = _appDataFolder.Combine("Sites", _appDataFolder.Combine(shellSettings.Name, WarmupFilename));
Logger = NullLogger.Instance;
}
@@ -44,8 +54,8 @@ namespace Orchard.Warmup.Services {
var baseUrl = _orchardServices.WorkContext.CurrentSite.BaseUrl;
var part = _orchardServices.WorkContext.CurrentSite.As<WarmupSettingsPart>();
// do nothing while the base url setting is not defined, or if there is no page defined
if (String.IsNullOrWhiteSpace(baseUrl) || String.IsNullOrWhiteSpace(part.Urls)) {
// do nothing while the base url setting is not defined
if (String.IsNullOrWhiteSpace(baseUrl)) {
return;
}
@@ -60,10 +70,9 @@ namespace Orchard.Warmup.Services {
// check if we need to regenerate the pages by reading the last time it has been done
// 1- if the warmup file doesn't exists, generate the pages
// 2- otherwise, if the scheduled generation option is on, check if the delay is over
var warmupPath = _appDataFolder.Combine(BaseFolder, WarmupFilename);
if(_appDataFolder.FileExists(warmupPath)) {
if (_appDataFolder.FileExists(_warmupPath)) {
try {
var warmupContent = _appDataFolder.ReadFile(warmupPath);
var warmupContent = _appDataFolder.ReadFile(_warmupPath);
var expired = XmlConvert.ToDateTimeOffset(warmupContent).AddMinutes(part.Delay);
if (expired > _clock.UtcNow) {
return;
@@ -71,63 +80,104 @@ namespace Orchard.Warmup.Services {
}
catch {
// invalid file, delete continue processing
_appDataFolder.DeleteFile(warmupPath);
_appDataFolder.DeleteFile(_warmupPath);
}
}
// delete existing static page files
foreach (var filename in _appDataFolder.ListFiles(BaseFolder)) {
var prefix = _appDataFolder.Combine(BaseFolder, "http");
// delete only static page files
if (!filename.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) {
continue;
}
try {
_appDataFolder.DeleteFile(filename);
}
catch(Exception e) {
// ignore files which could not be deleted
Logger.Error(e, "Could not delete file {0}", filename);
}
}
// loop over every relative url to generate the contents
using (var urlReader = new StringReader(part.Urls)) {
string relativeUrl;
while (null != (relativeUrl = urlReader.ReadLine())) {
string url = null;
relativeUrl = relativeUrl.Trim();
// delete peviously generated pages, by reading the Warmup Report file
try {
var encodedPrefix = WarmupUtility.EncodeUrl("http://www.");
foreach (var reportEntry in _reportManager.Read()) {
try {
url = VirtualPathUtility.RemoveTrailingSlash(baseUrl) + relativeUrl;
var download = _webDownloader.Download(url);
if (download != null && download.StatusCode == HttpStatusCode.OK) {
var filename = WarmupUtility.EncodeUrl(url.TrimEnd('/'));
var path = _appDataFolder.Combine(BaseFolder, filename);
_appDataFolder.CreateFile(path, download.Content);
// if the base url contains http://www, then also render the www-less one
if (url.StartsWith("http://www.", StringComparison.OrdinalIgnoreCase)) {
url = "http://" + url.Substring("http://www.".Length);
filename = WarmupUtility.EncodeUrl(url.TrimEnd('/'));
path = _appDataFolder.Combine(BaseFolder, filename);
_appDataFolder.CreateFile(path, download.Content);
}
// use FileName as the SiteBaseUrl could have changed in the meantime
var path = _appDataFolder.Combine(BaseFolder, reportEntry.Filename);
_appDataFolder.DeleteFile(path);
// delete the www-less version too if it's available
if (reportEntry.Filename.StartsWith(encodedPrefix, StringComparison.OrdinalIgnoreCase)) {
var filename = WarmupUtility.EncodeUrl("http://") + reportEntry.Filename.Substring(encodedPrefix.Length);
path = _appDataFolder.Combine(BaseFolder, filename);
_appDataFolder.DeleteFile(path);
}
}
catch (Exception e) {
Logger.Error(e, "Could not extract warmup page content for: ", url);
Logger.Error(e, "Could not delete specific warmup file: ", reportEntry.Filename);
}
}
}
catch(Exception e) {
Logger.Error(e, "Could not read warmup report file");
}
var reportEntries = new List<ReportEntry>();
if (!String.IsNullOrEmpty(part.Urls)) {
// loop over every relative url to generate the contents
using (var urlReader = new StringReader(part.Urls)) {
string relativeUrl;
while (null != (relativeUrl = urlReader.ReadLine())) {
string url = null;
relativeUrl = relativeUrl.Trim();
try {
url = VirtualPathUtility.RemoveTrailingSlash(baseUrl) + relativeUrl;
var filename = WarmupUtility.EncodeUrl(url.TrimEnd('/'));
var path = _appDataFolder.Combine(BaseFolder, filename);
var download = _webDownloader.Download(url);
if (download != null) {
if (download.StatusCode == HttpStatusCode.OK) {
// success
_appDataFolder.CreateFile(path, download.Content);
reportEntries.Add(new ReportEntry {
RelativeUrl = relativeUrl,
Filename = filename,
StatusCode = (int) download.StatusCode,
CreatedUtc = _clock.UtcNow
});
// if the base url contains http://www, then also render the www-less one);
if (url.StartsWith("http://www.", StringComparison.OrdinalIgnoreCase)) {
url = "http://" + url.Substring("http://www.".Length);
filename = WarmupUtility.EncodeUrl(url.TrimEnd('/'));
path = _appDataFolder.Combine(BaseFolder, filename);
_appDataFolder.CreateFile(path, download.Content);
}
}
else {
reportEntries.Add(new ReportEntry {
RelativeUrl = relativeUrl,
Filename = filename,
StatusCode = (int) download.StatusCode,
CreatedUtc = _clock.UtcNow
});
}
}
else {
// download failed
reportEntries.Add(new ReportEntry {
RelativeUrl = relativeUrl,
Filename = filename,
StatusCode = 0,
CreatedUtc = _clock.UtcNow
});
}
}
catch (Exception e) {
Logger.Error(e, "Could not extract warmup page content for: ", url);
}
}
}
}
_reportManager.Create(reportEntries);
// finally write the time the generation has been executed
_appDataFolder.CreateFile(warmupPath, XmlConvert.ToString(_clock.UtcNow, XmlDateTimeSerializationMode.Utc));
_appDataFolder.CreateFile(_warmupPath, XmlConvert.ToString(_clock.UtcNow, XmlDateTimeSerializationMode.Utc));
}
}
@@ -139,9 +189,8 @@ namespace Orchard.Warmup.Services {
}
using (lockFile) {
var warmupPath = _appDataFolder.Combine(BaseFolder, WarmupFilename);
if (_appDataFolder.FileExists(warmupPath)) {
_appDataFolder.DeleteFile(warmupPath);
if (_appDataFolder.FileExists(_warmupPath)) {
_appDataFolder.DeleteFile(_warmupPath);
}
}