@@ -248,8 +248,7 @@ private void ChangeWhenDiagnosticSettingsExist(SqlAuditAdapter adapter, Diagnost
248
248
249
249
private void ChangeWhenMultipleCategoriesAreEnabled ( SqlAuditAdapter adapter , DiagnosticSettingsResource settings )
250
250
{
251
- DisableAuditCategory ( settings ) ;
252
- if ( adapter . UpdateDiagnosticSettings ( settings , this ) == false )
251
+ if ( DisableAuditCategory ( adapter , settings ) == false )
253
252
{
254
253
throw DefinitionsCommon . UpdateDiagnosticSettingsException ;
255
254
}
@@ -282,8 +281,7 @@ private void ChangeWhenMultipleCategoriesAreEnabled(SqlAuditAdapter adapter, Dia
282
281
{
283
282
try
284
283
{
285
- EnableAuditCategory ( settings ) ;
286
- adapter . UpdateDiagnosticSettings ( settings , this ) ;
284
+ EnableAuditCategory ( adapter , settings ) ;
287
285
}
288
286
catch ( Exception ) { }
289
287
@@ -386,23 +384,25 @@ private void ChangeWhenOnlyAuditCategoryIsEnabled(SqlAuditAdapter adapter, Diagn
386
384
}
387
385
}
388
386
389
- private void SetAuditCategoryState ( DiagnosticSettingsResource settings , bool enabled )
387
+ private bool SetAuditCategoryState ( SqlAuditAdapter adapter , DiagnosticSettingsResource settings , bool isEenabled )
390
388
{
391
389
var log = settings ? . Logs ? . FirstOrDefault ( l => string . Equals ( l . Category , DefinitionsCommon . SQLSecurityAuditCategory ) ) ;
392
390
if ( log != null )
393
391
{
394
- log . Enabled = enabled ;
392
+ log . Enabled = isEenabled ;
395
393
}
394
+
395
+ return adapter . UpdateDiagnosticSettings ( settings , this ) ;
396
396
}
397
397
398
- private void EnableAuditCategory ( DiagnosticSettingsResource settings )
398
+ private bool EnableAuditCategory ( SqlAuditAdapter adapter , DiagnosticSettingsResource settings )
399
399
{
400
- SetAuditCategoryState ( settings , true ) ;
400
+ return SetAuditCategoryState ( adapter , settings , true ) ;
401
401
}
402
402
403
- private void DisableAuditCategory ( DiagnosticSettingsResource settings )
403
+ private bool DisableAuditCategory ( SqlAuditAdapter adapter , DiagnosticSettingsResource settings )
404
404
{
405
- SetAuditCategoryState ( settings , false ) ;
405
+ return SetAuditCategoryState ( adapter , settings , false ) ;
406
406
}
407
407
408
408
private bool IsAnotherCategoryEnabled ( DiagnosticSettingsResource settings )
0 commit comments