diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 2b32b7bda2a..29fd339617a 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,17 @@
+#### 1.4.37 April 14 2022 ####
+Akka.NET v1.4.37 is a minor release that contains some minor bug fixes.
+
+* [Persistence.Query: Change AllEvents query failure log severity from Debug to Error](https://github.com/akkadotnet/akka.net/pull/5835)
+* [Coordination: Harden LeaseProvider instance Activator exception handling](https://github.com/akkadotnet/akka.net/pull/5838)
+* [Akka: Make ActorSystemImpl.Abort skip the CoordinatedShutdown check](https://github.com/akkadotnet/akka.net/pull/5839)
+
+If you want to see the [full set of changes made in Akka.NET v1.4.37, click here](https://github.com/akkadotnet/akka.net/milestone/68?closed=1).
+
+| COMMITS | LOC+ | LOC- | AUTHOR |
+|---------|------|------|---------------------|
+| 3 | 15 | 4 | Gregorius Soedharmo |
+| 1 | 2 | 2 | dependabot[bot] |
+
#### 1.4.36 April 4 2022 ####
Akka.NET v1.4.36 is a minor release that contains some bug fixes. Most of the changes have been aimed at improving our web documentation and code cleanup to modernize some of our code.
diff --git a/src/contrib/persistence/Akka.Persistence.Query.Sql/AllEventsPublisher.cs b/src/contrib/persistence/Akka.Persistence.Query.Sql/AllEventsPublisher.cs
index 27f69adb23c..f66d7f9bce2 100644
--- a/src/contrib/persistence/Akka.Persistence.Query.Sql/AllEventsPublisher.cs
+++ b/src/contrib/persistence/Akka.Persistence.Query.Sql/AllEventsPublisher.cs
@@ -127,7 +127,7 @@ protected bool Replaying( object message )
ReceiveRecoverySuccess(success.HighestSequenceNr);
return true;
case EventReplayFailure failure:
- Log.Debug("event replay failed, due to [{0}]", failure.Cause.Message);
+ Log.Error(failure.Cause, "event replay failed, due to [{0}]", failure.Cause.Message);
Buffer.DeliverBuffer(TotalDemand);
OnErrorThenStop(failure.Cause);
return true;
diff --git a/src/contrib/persistence/Akka.Persistence.Sqlite/Akka.Persistence.Sqlite.csproj b/src/contrib/persistence/Akka.Persistence.Sqlite/Akka.Persistence.Sqlite.csproj
index 81f3ad89f50..f324950c353 100644
--- a/src/contrib/persistence/Akka.Persistence.Sqlite/Akka.Persistence.Sqlite.csproj
+++ b/src/contrib/persistence/Akka.Persistence.Sqlite/Akka.Persistence.Sqlite.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/src/core/Akka.Coordination/LeaseProvider.cs b/src/core/Akka.Coordination/LeaseProvider.cs
index 5f3df3b0fb1..0aeb012b1d8 100644
--- a/src/core/Akka.Coordination/LeaseProvider.cs
+++ b/src/core/Akka.Coordination/LeaseProvider.cs
@@ -141,12 +141,12 @@ public Lease GetLease(string leaseName, string configPath, string ownerName)
{
return (Lease)Activator.CreateInstance(leaseType, settings, _system);
}
- catch
+ catch(MissingMethodException)
{
return (Lease)Activator.CreateInstance(leaseType, settings);
}
}
- catch (Exception ex)
+ catch (MissingMethodException ex)
{
Log.Error(
ex,
@@ -159,6 +159,17 @@ public Lease GetLease(string leaseName, string configPath, string ownerName)
throw;
}
+ catch(Exception ex)
+ {
+ Log.Error(
+ ex,
+ "Failed to instantiate lease class [{2}] for leaseName [{0}], configPath [{1}].",
+ settings.LeaseName,
+ configPath,
+ leaseType);
+
+ throw;
+ }
});
}
}
diff --git a/src/core/Akka/Actor/Internal/ActorSystemImpl.cs b/src/core/Akka/Actor/Internal/ActorSystemImpl.cs
index ed08b4acefa..1621ba3eceb 100644
--- a/src/core/Akka/Actor/Internal/ActorSystemImpl.cs
+++ b/src/core/Akka/Actor/Internal/ActorSystemImpl.cs
@@ -199,7 +199,7 @@ public override IActorRef SystemActorOf(string name = null)
public override void Abort()
{
Aborting = true;
- Terminate();
+ FinalTerminate(); // Skip CoordinatedShutdown check and aggressively shutdown the ActorSystem
}
/// Starts this system
diff --git a/src/examples/Akka.Persistence.Custom/Akka.Persistence.Custom.csproj b/src/examples/Akka.Persistence.Custom/Akka.Persistence.Custom.csproj
index 6fc45dc74e1..84b09ea7d6c 100644
--- a/src/examples/Akka.Persistence.Custom/Akka.Persistence.Custom.csproj
+++ b/src/examples/Akka.Persistence.Custom/Akka.Persistence.Custom.csproj
@@ -6,7 +6,7 @@
-
+