Skip to content

Commit 3f4020c

Browse files
SQLTrace DELETEOLDFILES Fixes
Fixed path in DeleteOldFiles for auth files. Was pointing to NetworkTraces folder incorrectly.
1 parent eadde73 commit 3f4020c

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

SQLTrace/SQLTrace.ps1

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ LogRaw "
9696
/_______ /\_____\ \_/|_______ \|____| |__| (____ / \___ >\___ >
9797
\/ \__> \/ \/ \/ \/
9898
99-
SQLTrace.ps1 version 1.0.0171.0
99+
SQLTrace.ps1 version 1.0.0183.0
100100
by the Microsoft SQL Server Networking Team
101101
"
102102

@@ -668,24 +668,25 @@ Function StartDeleteOldFiles
668668
{
669669
$PathToClean = $FilesToDelete[$Name]
670670
$FileSpec = $PathToClean[0]
671-
$MinMinutes = $PathToClean[1] -as [int]
672-
$MinFiles = $PathToClean[2] -as [int]
671+
$MinMinutes = $PathToClean[1]
672+
$MinFiles = $PathToClean[2]
673673
"$Name=$fileSpec, Min Minutes=$MinMinutes, Min Files=$MinFiles"
674674
}
675675

676676
$jobname = "DeleteOldFiles"
677677

678678
$job=Register-ScheduledJob -Name "DeleteOldFiles" -scriptblock {
679-
Param($FilesToDelete)
679+
Param ( $FilesToDelete )
680680
foreach ($Name in $FilesToDelete.Keys)
681681
{
682682
$PathToClean = $FilesToDelete[$Name]
683683
$FileSpec = $PathToClean[0]
684684
$MinMinutes = $PathToClean[1] -as [int]
685-
$MinFiles = $PathToClean[2] -as [int]
685+
$MinFiles = $PathToClean[2] -as [int]
686686
get-item $FileSpec | sort-object -property LastWriteTime -descending | select -skip $MinFiles | where-object {$_.LastWriteTime -lt ((get-date).AddMinutes($MinMinutes * -1))} | remove-item -force
687+
# get-item $FileSpec | sort-object -property LastWriteTime -descending | select -skip 5 | where-object {$_.LastWriteTime -lt ((get-date).AddMinutes(5 * -1))} | remove-item -force
687688
}
688-
} -ArgumentList $FilesToDelete
689+
} -ArgumentList $FilesToDelete
689690
$job.Options.RunElevated=$True
690691
$cleanupJob=New-JobTrigger -Once -At (get-date).AddSeconds(2) -RepetitionInterval (New-TimeSpan -Minutes 5) -RepeatIndefinitely # runs once every 5 minutes
691692
Add-JobTrigger -Trigger $cleanupjob -Name $jobname
@@ -857,7 +858,7 @@ Function StartAuthenticationTraces
857858
}
858859

859860
# Values for DeleteOldFiles
860-
$CleanupValues = "$($global:LogFolderName)\NetworkTraces\Kerberos*.etl", $global:INISettings.MinMinutes, $global:INISettings.MinFiles # Filespec, min_minutes, min_files
861+
$CleanupValues = "$($global:LogFolderName)\Auth\Kerberos*.etl", $global:INISettings.MinMinutes, $global:INISettings.MinFiles # Filespec, min_minutes, min_files
861862
$PathsToClean.Add("Kerberos", $CleanupValues)
862863
}
863864

@@ -889,7 +890,7 @@ Function StartAuthenticationTraces
889890
}
890891

891892
# Values for DeleteOldFiles
892-
$CleanupValues = "$($global:LogFolderName)\NetworkTraces\Ntlm_CredSSP*.etl", $global:INISettings.MinMinutes, $global:INISettings.MinFiles # Filespec, min_minutes, min_files
893+
$CleanupValues = "$($global:LogFolderName)\Auth\Ntlm_CredSSP*.etl", $global:INISettings.MinMinutes, $global:INISettings.MinFiles # Filespec, min_minutes, min_files
893894
$PathsToClean.Add("NTLM", $CleanupValues)
894895
}
895896

@@ -918,7 +919,7 @@ Function StartAuthenticationTraces
918919
}
919920

920921
# Values for DeleteOldFiles
921-
$CleanupValues = "$($global:LogFolderName)\NetworkTraces\SSL*.etl", $global:INISettings.MinMinutes, $global:INISettings.MinFiles # Filespec, min_minutes, min_files
922+
$CleanupValues = "$($global:LogFolderName)\Auth\SSL*.etl", $global:INISettings.MinMinutes, $global:INISettings.MinFiles # Filespec, min_minutes, min_files
922923
$PathsToClean.Add("SSL", $CleanupValues)
923924
}
924925

@@ -983,7 +984,7 @@ Function StartAuthenticationTraces
983984
}
984985

985986
# Values for DeleteOldFiles
986-
$CleanupValues = "$($global:LogFolderName)\NetworkTraces\LSA*.etl", $global:INISettings.MinMinutes, $global:INISettings.MinFiles # Filespec, min_minutes, min_files
987+
$CleanupValues = "$($global:LogFolderName)\Auth\LSA*.etl", $global:INISettings.MinMinutes, $global:INISettings.MinFiles # Filespec, min_minutes, min_files
987988
$PathsToClean.Add("LSA", $CleanupValues)
988989
}
989990

-512 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

SQL_Network_Analyzer/SQLNA/OutputText.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private static void DisplayFileStatistics(NetworkTrace Trace)
6767
rf.SetcolumnData(Trace.files.IndexOf(f).ToString(),
6868
f.filePath,
6969
(new DateTime(f.startTick)).ToString(utility.DATE_FORMAT),
70-
(new DateTime(f.endTick)).ToString(utility.TIME_FORMAT),
70+
(new DateTime(f.endTick)).ToString(utility.DATE_FORMAT),
7171
f.frameCount.ToString("#,##0"),
7272
f.fileSize.ToString("#,##0"));
7373
}

SQL_Network_Analyzer/SQLNA/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.5.2054.0")]
36-
[assembly: AssemblyFileVersion("1.5.2054.0")]
35+
[assembly: AssemblyVersion("1.5.2055.0")]
36+
[assembly: AssemblyFileVersion("1.5.2055.0")]

0 commit comments

Comments
 (0)