Disable jobs for disabled nodes on restart

Elenpay · Sep 2, 2024 · 6328d0c · 6328d0c
1 parent b63d8cf
commit 6328d0c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 16 deletions.
diff --git a/src/Data/Repositories/Interfaces/INodeRepository.cs b/src/Data/Repositories/Interfaces/INodeRepository.cs
@@ -34,7 +34,7 @@ public interface INodeRepository
 
     Task<List<Node>> GetAllManagedByUser(string userId);
 
-    Task<List<Node>> GetAllManagedByNodeGuard();
+    Task<List<Node>> GetAllManagedByNodeGuard(bool withDisabled = true);
 
     Task<(bool, string?)> AddAsync(Node type);
 
@@ -45,4 +45,4 @@ public interface INodeRepository
     (bool, string?) RemoveRange(List<Node> types);
 
     (bool, string?) Update(Node type);
-}
+}
diff --git a/src/Data/Repositories/NodeRepository.cs b/src/Data/Repositories/NodeRepository.cs
@@ -110,7 +110,7 @@ public async Task<List<Node>> GetAll()
                 .ToListAsync();
         }
 
-        public async Task<List<Node>> GetAllManagedByNodeGuard()
+        public async Task<List<Node>> GetAllManagedByNodeGuard(bool withDisabled = true)
         {
             await using var applicationDbContext = await _dbContextFactory.CreateDbContextAsync();
 
@@ -119,6 +119,11 @@ public async Task<List<Node>> GetAllManagedByNodeGuard()
                 .ThenInclude(x => x.Keys)
                 .Include(x => x.ReturningFundsWallet)
                 .Where(node => node.Endpoint != null);
+            if (!withDisabled)
+            {
+                query = query.Where(node => !node.IsNodeDisabled);
+
+            }
 
             var resultAsync = await query.ToListAsync();
 
@@ -182,4 +187,4 @@ public async Task<List<Node>> GetAllManagedByUser(string userId)
             return _repository.Update(type, applicationDbContext);
         }
     }
-}
+}
diff --git a/src/Jobs/ChannelAcceptorJob.cs b/src/Jobs/ChannelAcceptorJob.cs
@@ -48,7 +48,7 @@ public async Task Execute(IJobExecutionContext context)
         _logger.LogInformation("Starting {JobName}... ", nameof(ChannelAcceptorJob));
         try
         {
-            var managedNodes = await _nodeRepository.GetAllManagedByNodeGuard();
+            var managedNodes = await _nodeRepository.GetAllManagedByNodeGuard(false);
 
             var scheduler = await _schedulerFactory.GetScheduler();
             foreach (var managedNode in managedNodes)
@@ -70,4 +70,4 @@ public async Task Execute(IJobExecutionContext context)
 
         _logger.LogInformation("{JobName} ended", nameof(ChannelAcceptorJob));
     }
-}
+}
diff --git a/src/Jobs/MonitorChannelsJob.cs b/src/Jobs/MonitorChannelsJob.cs
@@ -22,7 +22,7 @@ public async Task Execute(IJobExecutionContext context)
         _logger.LogInformation("Starting {JobName}... ", nameof(MonitorChannelsJob));
         try
         {
-            var managedNodes = await _nodeRepository.GetAllManagedByNodeGuard();
+            var managedNodes = await _nodeRepository.GetAllManagedByNodeGuard(false);
 
             var scheduler = await _schedulerFactory.GetScheduler();
 
@@ -51,4 +51,4 @@ public async Task Execute(IJobExecutionContext context)
 
         _logger.LogInformation("{JobName} ended", nameof(MonitorChannelsJob));
     }
-}
+}
diff --git a/src/Jobs/NodeChannelSubscribeJob.cs b/src/Jobs/NodeChannelSubscribeJob.cs
@@ -97,7 +97,7 @@ public async Task Execute(IJobExecutionContext context)
         {
             _logger.LogError(e, "Error while subscribing for the channel updates of node {NodeId}", nodeId);
             //Sleep to avoid massive requests
-            await Task.Delay(1000);
+            await Task.Delay(5000);
 
             throw new JobExecutionException(e, true);
         }
@@ -176,4 +176,4 @@ public async Task NodeUpdateManagement(ChannelEventUpdate channelEventUpdate, No
                 break;
         }
     }
-}
+}
diff --git a/src/Jobs/NodeSubscriptorJob.cs b/src/Jobs/NodeSubscriptorJob.cs
@@ -23,7 +23,7 @@ public async Task Execute(IJobExecutionContext context)
         _logger.LogInformation("Starting {JobName}... ", nameof(NodeSubscriptorJob));
         try
         {
-            var managedNodes = await _nodeRepository.GetAllManagedByNodeGuard();
+            var managedNodes = await _nodeRepository.GetAllManagedByNodeGuard(false);
 
             var scheduler = await _schedulerFactory.GetScheduler();
 
@@ -48,4 +48,4 @@ public async Task Execute(IJobExecutionContext context)
 
         _logger.LogInformation("{JobName} ended", nameof(NodeSubscriptorJob));
     }
-}
+}
diff --git a/src/Jobs/ProcessNodeChannelAcceptorJob.cs b/src/Jobs/ProcessNodeChannelAcceptorJob.cs
@@ -240,10 +240,10 @@ await AcceptChannelOpeningRequestWithUpfrontShutdown(_nBXplorerService,
             _logger.LogError(e, "Error on {JobName}", nameof(ProcessNodeChannelAcceptorJob));
 
             //Sleep to avoid massive requests
-            await Task.Delay(1000);
+            await Task.Delay(5000);
 
             throw new JobExecutionException(e, true);
 
         }
     }
-}
+}
diff --git a/src/Jobs/SweepAllNodesWalletsJob.cs b/src/Jobs/SweepAllNodesWalletsJob.cs
@@ -46,7 +46,7 @@ public async Task Execute(IJobExecutionContext context)
             _logger.LogInformation("Starting {JobName}... ", nameof(SweepAllNodesWalletsJob));
             try
             {
-                var managedNodes = await _nodeRepository.GetAllManagedByNodeGuard();
+                var managedNodes = await _nodeRepository.GetAllManagedByNodeGuard(false);
 
                 var scheduler = await _schedulerFactory.GetScheduler();
                 foreach (var managedNode in managedNodes.Where(managedNode => managedNode.ChannelAdminMacaroon != null && managedNode.AutosweepEnabled))
@@ -72,4 +72,4 @@ public async Task Execute(IJobExecutionContext context)
             _logger.LogInformation("{JobName} ended", nameof(SweepAllNodesWalletsJob));
         }
     }
-}
+}