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

Refactored disposal of DatabaseLock.

Browse Source 
This ensures the cleanup will be able to resolve a database transaction even when it's Autofac that's disposing the object.
This commit is contained in:
Sipke Schoorstra
2015-08-10 15:13:03 +01:00
parent b62939f850
commit 17082eec9c
1 changed files with 49 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/Orchard.Web/Modules/Orchard.TaskLease/Services/DatabaseLock.cs
View File

@@ -5,6 +5,7 @@ using Autofac;
using Orchard.Data;
using Orchard.Environment.Extensions;
using Orchard.Exceptions;
using Orchard.Logging;
using Orchard.Services;
using Orchard.TaskLease.Models;
using Orchard.Tasks.Locking;
@@ -23,21 +24,28 @@ namespace Orchard.TaskLease.Services {
private bool _isAcquired;
private int _id;
private bool _isDisposed;
private ILifetimeScope _scope;
public DatabaseLock(ILifetimeScope lifetimeScope, IClock clock) {
_lifetimeScope = lifetimeScope;
_clock = clock;
Logger = NullLogger.Instance;
}
public ILogger Logger { get; set; }
public bool TryAcquire(string name, TimeSpan maxLifetime) {
Argument.ThrowIfNullOrEmpty(name, "name");
if (name.Length > 256)
throw new ArgumentException("The lock's name can't be longer than 256 characters.");
// This way we can create a nested transaction scope instead of having the unwanted effect
// of manipulating the transaction of the caller.
using (var scope = BeginLifeTimeScope(name)) {
try {
var scope = EnsureLifetimeScope(name);
scope.Resolve<ITransactionManager>().RequireNew(IsolationLevel.ReadCommitted);
// This way we can create a nested transaction scope instead of having the unwanted effect
// of manipulating the transaction of the caller.
var repository = scope.Resolve<IRepository<DatabaseLockRecord>>();
var record = repository.Table.FirstOrDefault(x => x.Name == name);
@@ -67,34 +75,47 @@ namespace Orchard.TaskLease.Services {
return canAcquire;
}
}
// This will be called at least by the IoC container when the request ends.
public void Dispose() {
if (_isDisposed || !_isAcquired) return;
_isDisposed = true;
using (var scope = BeginLifeTimeScope(_name)) {
try {
var repository = scope.Resolve<IRepository<DatabaseLockRecord>>();
var record = repository.Get(_id);
if (record != null) {
repository.Delete(record);
repository.Flush();
}
}
catch (Exception ex) {
if (ex.IsFatal()) throw;
}
catch (Exception ex) {
Logger.Error(ex, "An error occurred while trying to acquire a lock.");
DisposeLifetimeScope();
throw;
}
}
private ILifetimeScope BeginLifeTimeScope(string name) {
var scope = _lifetimeScope.BeginLifetimeScope("Orchard.Tasks.Locking.Database." + name);
scope.Resolve<ITransactionManager>().RequireNew(IsolationLevel.ReadCommitted);
return scope;
// This will be called at least and at the latest by the IoC container when the request ends.
public void Dispose() {
if (_scope == null)
return;
if (!_isDisposed) {
_isDisposed = true;
if (_isAcquired) {
try {
var repository = _scope.Resolve<IRepository<DatabaseLockRecord>>();
var record = repository.Get(_id);
if (record != null) {
repository.Delete(record);
repository.Flush();
}
}
catch (Exception ex) {
if (ex.IsFatal()) throw;
}
}
_scope.Dispose();
}
}
private ILifetimeScope EnsureLifetimeScope(string name) {
return _scope = _lifetimeScope.BeginLifetimeScope("Orchard.Tasks.Locking.Database." + name);
}
private void DisposeLifetimeScope() {
if (_scope != null)
_scope.Dispose();
}
}
}