From 03de287884074de1d3a13ef93f77df4de1df99bb Mon Sep 17 00:00:00 2001
From: Ismael Hamed <1279846+ismaelhamed@users.noreply.github.com>
Date: Mon, 8 Aug 2022 18:47:02 +0200
Subject: [PATCH] Fixes log and uses cluster sharding `LeaseSettings`, if
 configured, in ShardedDaemonProcess (#6058)

---
 .../cluster/Akka.Cluster.Sharding/ShardedDaemonProcess.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/ShardedDaemonProcess.cs b/src/contrib/cluster/Akka.Cluster.Sharding/ShardedDaemonProcess.cs
index 2be1f5d25b7..855e9f09518 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/ShardedDaemonProcess.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/ShardedDaemonProcess.cs
@@ -43,9 +43,10 @@ protected override void PreStart()
         {
             base.PreStart();
 
-            Context.System.Log.Debug("Starting Sharded Daemon Process KeepAlivePinger for [{0}], with ping interval [{1}]");
-            Timers.StartPeriodicTimer("tick", Tick.Instance, Settings.KeepAliveInterval);
             TriggerStartAll();
+            Context.System.Log.Debug("Starting Sharded Daemon Process KeepAlivePinger for [{0}], with ping interval [{1}]", 
+                Name, Settings.KeepAliveInterval);
+            Timers.StartPeriodicTimer("tick", Tick.Instance, Settings.KeepAliveInterval);
         }
 
         protected override void OnReceive(object message)
@@ -175,7 +176,8 @@ public void Init(string name, int numberOfInstances, Func<int, Props> propsFacto
                 TimeSpan.Zero, // passivation disabled
                 StateStoreMode.DData,
                 shardingBaseSettings.TuningParameters,
-                shardingBaseSettings.CoordinatorSingletonSettings);
+                shardingBaseSettings.CoordinatorSingletonSettings, 
+                shardingBaseSettings.LeaseSettings);
 
             if (string.IsNullOrEmpty(shardingSettings.Role) || Cluster.Get(_system).SelfRoles.Contains(shardingSettings.Role))
             {