admin/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2026-01-31 14:13:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Catch general exception for all db types (#6846)

Browse Source 
* Switch `SqlException` to `DbException`

Co-authored-by: rkac-bw <148072202+rkac-bw@users.noreply.github.com>

* Fix CA2253

---------

Co-authored-by: rkac-bw <148072202+rkac-bw@users.noreply.github.com>
This commit is contained in:
Justin Baur
2026-01-14 16:27:39 -05:00
committed by GitHub
parent fa845a4753
commit 584af2ee3f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Admin/HostedServices/DatabaseMigrationHostedService.cs
View File

@@ -1,5 +1,5 @@
using Bit.Core.Utilities; using System.Data.Common;
using Microsoft.Data.SqlClient; using Bit.Core.Utilities;
namespace Bit.Admin.HostedServices; namespace Bit.Admin.HostedServices;
@@ -30,7 +30,7 @@ public class DatabaseMigrationHostedService : IHostedService, IDisposable
// TODO: Maybe flip a flag somewhere to indicate migration is complete?? // TODO: Maybe flip a flag somewhere to indicate migration is complete??
break; break;
} }
catch (SqlException e) catch (DbException e)
{ {
if (i >= maxMigrationAttempts) if (i >= maxMigrationAttempts)
{ {
@@ -40,7 +40,7 @@ public class DatabaseMigrationHostedService : IHostedService, IDisposable
else else
{ {
_logger.LogError(e, _logger.LogError(e,
"Database unavailable for migration. Trying again (attempt #{0})...", i + 1); "Database unavailable for migration. Trying again (attempt #{AttemptNumber})...", i + 1);
await Task.Delay(20000, cancellationToken); await Task.Delay(20000, cancellationToken);
} }
} }