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

Renamed a method and improved logging messages.

Browse Source 
- Renamed ImportedAll to ImportCompleted.
- Added a "batch label" to the BatchedInvoke method to be able to better identify what's being executed from the log files.
This commit is contained in:
Sipke Schoorstra
2015-10-12 12:54:59 +02:00
parent f8ae4cf626
commit 9605d216e6
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ContentStep.cs
View File

@@ -76,12 +76,12 @@ namespace Orchard.Recipes.Providers.Executors {
// Import Data. // Import Data.
public override void Execute(RecipeExecutionContext context) { public override void Execute(RecipeExecutionContext context) {
// Run the import. // Run the import.
BatchedInvoke(context, (itemId, nextIdentityValue, element, importContentSession, elementDictionary) => { BatchedInvoke(context, "Import", (itemId, nextIdentityValue, element, importContentSession, elementDictionary) => {
_orchardServices.ContentManager.Import(element, importContentSession); _orchardServices.ContentManager.Import(element, importContentSession);
}); });
// Invoke ImportCompleted. // Invoke ImportCompleted.
BatchedInvoke(context, (itemId, nextIdentityValue, element, importContentSession, elementDictionary) => { BatchedInvoke(context, "ImportCompleted", (itemId, nextIdentityValue, element, importContentSession, elementDictionary) => {
var contentItem = importContentSession.Get(itemId, VersionOptions.Latest); var contentItem = importContentSession.Get(itemId, VersionOptions.Latest);
var importContentContext = new ImportContentContext(contentItem, elementDictionary[nextIdentityValue], importContentSession); var importContentContext = new ImportContentContext(contentItem, elementDictionary[nextIdentityValue], importContentSession);
foreach (var handler in _handlers.Value) { foreach (var handler in _handlers.Value) {
@@ -90,7 +90,7 @@ namespace Orchard.Recipes.Providers.Executors {
}); });
} }
private void BatchedInvoke(RecipeExecutionContext context, Action<string, string, XElement, ImportContentSession, IDictionary<string, XElement>> contentItemAction) { private void BatchedInvoke(RecipeExecutionContext context, string batchLabel, Action<string, string, XElement, ImportContentSession, IDictionary<string, XElement>> contentItemAction) {
var importContentSession = new ImportContentSession(_orchardServices.ContentManager); var importContentSession = new ImportContentSession(_orchardServices.ContentManager);
// Populate local dictionary with elements and their ids. // Populate local dictionary with elements and their ids.
@@ -103,14 +103,14 @@ namespace Orchard.Recipes.Providers.Executors {
// Determine if the import is to be batched in multiple transactions. // Determine if the import is to be batched in multiple transactions.
var batchSize = GetBatchSizeForDataStep(context.RecipeStep.Step); var batchSize = GetBatchSizeForDataStep(context.RecipeStep.Step);
Logger.Debug("Using batch size {0}.", batchSize);
var startIndex = 0; var startIndex = 0;
var itemIndex = 0; var itemIndex = 0;
Logger.Debug("Using batch size {0}.", batchSize);
Logger.Debug("Using batch size {0} for '{1}'.", batchSize, batchLabel);
try { try {
while (startIndex < elementDictionary.Count) { while (startIndex < elementDictionary.Count) {
Logger.Debug("Batch execution starting at index {0}.", startIndex); Logger.Debug("Batch '{0}' execution starting at index {1}.", batchLabel, startIndex);
importContentSession.InitializeBatch(startIndex, batchSize); importContentSession.InitializeBatch(startIndex, batchSize);
// The session determines which items are included in the current batch // The session determines which items are included in the current batch
@@ -141,7 +141,7 @@ namespace Orchard.Recipes.Providers.Executors {
_transactionManager.RequireNew(); _transactionManager.RequireNew();
} }
Logger.Debug("Finished batch starting at index {0}.", startIndex); Logger.Debug("Finished batch '{0}' starting at index {1}.", batchLabel, startIndex);
} }
} }
catch (Exception) { catch (Exception) {

6
src/Orchard/ContentManagement/Handlers/ContentHandler.cs
View File

@@ -104,7 +104,7 @@ namespace Orchard.ContentManagement.Handlers {
Filters.Add(new InlineStorageFilter<TPart> { OnImported = handler }); Filters.Add(new InlineStorageFilter<TPart> { OnImported = handler });
} }
protected void OnImportedAll<TPart>(Action<ImportContentContext, TPart> handler) where TPart : class, IContent { protected void OnImportCompleted<TPart>(Action<ImportContentContext, TPart> handler) where TPart : class, IContent {
Filters.Add(new InlineStorageFilter<TPart> { OnImportCompleted = handler }); Filters.Add(new InlineStorageFilter<TPart> { OnImportCompleted = handler });
} }
@@ -419,7 +419,7 @@ namespace Orchard.ContentManagement.Handlers {
void IContentHandler.ImportCompleted(ImportContentContext importContentContext) { void IContentHandler.ImportCompleted(ImportContentContext importContentContext) {
foreach (var filter in Filters.OfType<IContentStorageFilter>()) foreach (var filter in Filters.OfType<IContentStorageFilter>())
filter.ImportCompleted(importContentContext); filter.ImportCompleted(importContentContext);
ImportedAll(importContentContext); ImportCompleted(importContentContext);
} }
void IContentHandler.Exporting(ExportContentContext context) { void IContentHandler.Exporting(ExportContentContext context) {
@@ -511,7 +511,7 @@ namespace Orchard.ContentManagement.Handlers {
protected virtual void Importing(ImportContentContext context) { } protected virtual void Importing(ImportContentContext context) { }
protected virtual void Imported(ImportContentContext context) { } protected virtual void Imported(ImportContentContext context) { }
protected virtual void ImportedAll(ImportContentContext context) { } protected virtual void ImportCompleted(ImportContentContext context) { }
protected virtual void Exporting(ExportContentContext context) { } protected virtual void Exporting(ExportContentContext context) { }
protected virtual void Exported(ExportContentContext context) { } protected virtual void Exported(ExportContentContext context) { }
protected virtual void Restoring(RestoreContentContext context) { } protected virtual void Restoring(RestoreContentContext context) { }