Skip to content

Commit 07c1914

Browse files
committed
Update ServerBlobAuditingSettingsModel.cs
1 parent fea47b6 commit 07c1914

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/Sql/Sql/Auditing/Model/ServerBlobAuditingSettingsModel.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,7 @@ private void ChangeWhenDiagnosticSettingsExist(SqlAuditAdapter adapter, Diagnost
248248

249249
private void ChangeWhenMultipleCategoriesAreEnabled(SqlAuditAdapter adapter, DiagnosticSettingsResource settings)
250250
{
251-
DisableAuditCategory(settings);
252-
if (adapter.UpdateDiagnosticSettings(settings, this) == false)
251+
if (DisableAuditCategory(adapter, settings) == false)
253252
{
254253
throw DefinitionsCommon.UpdateDiagnosticSettingsException;
255254
}
@@ -282,8 +281,7 @@ private void ChangeWhenMultipleCategoriesAreEnabled(SqlAuditAdapter adapter, Dia
282281
{
283282
try
284283
{
285-
EnableAuditCategory(settings);
286-
adapter.UpdateDiagnosticSettings(settings, this);
284+
EnableAuditCategory(adapter, settings);
287285
}
288286
catch (Exception) { }
289287

@@ -386,23 +384,25 @@ private void ChangeWhenOnlyAuditCategoryIsEnabled(SqlAuditAdapter adapter, Diagn
386384
}
387385
}
388386

389-
private void SetAuditCategoryState(DiagnosticSettingsResource settings, bool enabled)
387+
private bool SetAuditCategoryState(SqlAuditAdapter adapter, DiagnosticSettingsResource settings, bool isEenabled)
390388
{
391389
var log = settings?.Logs?.FirstOrDefault(l => string.Equals(l.Category, DefinitionsCommon.SQLSecurityAuditCategory));
392390
if (log != null)
393391
{
394-
log.Enabled = enabled;
392+
log.Enabled = isEenabled;
395393
}
394+
395+
return adapter.UpdateDiagnosticSettings(settings, this);
396396
}
397397

398-
private void EnableAuditCategory(DiagnosticSettingsResource settings)
398+
private bool EnableAuditCategory(SqlAuditAdapter adapter, DiagnosticSettingsResource settings)
399399
{
400-
SetAuditCategoryState(settings, true);
400+
return SetAuditCategoryState(adapter, settings, true);
401401
}
402402

403-
private void DisableAuditCategory(DiagnosticSettingsResource settings)
403+
private bool DisableAuditCategory(SqlAuditAdapter adapter, DiagnosticSettingsResource settings)
404404
{
405-
SetAuditCategoryState(settings, false);
405+
return SetAuditCategoryState(adapter, settings, false);
406406
}
407407

408408
private bool IsAnotherCategoryEnabled(DiagnosticSettingsResource settings)

0 commit comments

Comments
 (0)