v2.5

NL-Cristi · Feb 17, 2020 · ddf89aa · ddf89aa
1 parent 316e423
commit ddf89aa
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/LogCatcher/General/CatchFilteredIISzip.ps1 b/LogCatcher/General/CatchFilteredIISzip.ps1
@@ -67,7 +67,7 @@ function CatchFilteredIISzip {
             $logName = $GeneralTempLocation + "\SiteOverview.csv"
             $Global:SiteOverview | Export-csv -Path $logName -NoTypeInformation -Force -ErrorAction silentlycontinue -ErrorVariable +ErrorMessages
             Add-Type -assembly "system.io.compression.filesystem"
-            [io.compression.zipfile]::CreateFromDirectory($FilteredTempLocation, $FilteredZipFile) 
+            [io.compression.zipfile]::CreateFromDirectory($FilteredTempLocation, $FilteredZipFile)
 
             Remove-Item -Recurse $FilteredTempLocation -Force -ErrorAction silentlycontinue -ErrorVariable +ErrorMessages    
         }

diff --git a/LogCatcher/General/PopulateFilteredLogDefinition.ps1 b/LogCatcher/General/PopulateFilteredLogDefinition.ps1
@@ -369,7 +369,13 @@ function GenerateSiteOverview {
         $IISDefQuery.SmpProcessorAffinityMask=(Get-Website $siteinfo.name | Get-IISAppPool | Select-Object -ExpandProperty CPU).SmpProcessorAffinityMask.ToString()
         $IISDefQuery.SmpProcessorAffinityMask2=(Get-Website $siteinfo.name | Get-IISAppPool | Select-Object -ExpandProperty CPU).SmpProcessorAffinityMask2.ToString()
         #Recycling -> (Get-Website $siteinfo.name | Get-IISAppPool | Select-Object -ExpandProperty Recycling)
+        If ((Get-Website $siteinfo.name | Get-IISAppPool | Select-Object -ExpandProperty Recycling |Select-Object -ExpandProperty PeriodicRestart).Schedule.Time -eq $null)
+            {      
+        $IISDefQuery.RecyclingSchedule = "NotSet"
+            }      
+        else{
         $IISDefQuery.RecyclingSchedule = (Get-Website $siteinfo.name | Get-IISAppPool | Select-Object -ExpandProperty Recycling |Select-Object -ExpandProperty PeriodicRestart).Schedule.Time.ToString()
+        }  
         $IISDefQuery.RecyclingTime = (Get-Website $siteinfo.name | Get-IISAppPool | Select-Object -ExpandProperty Recycling |Select-Object -ExpandProperty PeriodicRestart).Time.ToString()
         $IISDefQuery.RecyclingMemory = (Get-Website $siteinfo.name | Get-IISAppPool | Select-Object -ExpandProperty Recycling |Select-Object -ExpandProperty PeriodicRestart).Memory.ToString()
         $IISDefQuery.RecyclingPrivateMemory = (Get-Website $siteinfo.name | Get-IISAppPool | Select-Object -ExpandProperty Recycling |Select-Object -ExpandProperty PeriodicRestart).PrivateMemory.ToString()

diff --git a/LogCatcher/LogCatcherV2.3.zip b/LogCatcher/LogCatcherV2.3.zip
diff --git a/LogCatcher/LogCatcherV2.4.zip b/LogCatcher/LogCatcherV2.4.zip
diff --git a/LogCatcher/LogsDefinition/LOGS.CSV b/LogCatcher/LogsDefinition/LOGS.CSV
@@ -7,6 +7,7 @@
 "CLAMSEN-HP","eShopLegacyWebForms","SitePath","C:\inetpub\Sites\eShopLegacyWebForms","Folder","Site"
 "CLAMSEN-HP","eShopOnBlazor","SitePath","C:\inetpub\Sites\eShopOnBlazor","Folder","Site"
 "CLAMSEN-HP","eShopOnWeb","SitePath","C:\inetpub\Sites\eShopOnWeb","Folder","Site"
+"CLAMSEN-HP","SessionDemo","SitePath","D:\FromPaul\SessionDemo","Folder","Site"
 "CLAMSEN-HP","Test","IISLogs","C:\inetpub\logs\LogFiles\W3SVC1","Folder","Site"
 "CLAMSEN-HP","BuggyBits","IISLogs","C:\inetpub\logs\LogFiles\W3SVC2","Folder","Site"
 "CLAMSEN-HP","CSharpGuitarBugs","IISLogs","C:\inetpub\logs\LogFiles\W3SVC3","Folder","Site"
@@ -15,6 +16,7 @@
 "CLAMSEN-HP","eShopLegacyWebForms","IISLogs","C:\inetpub\logs\LogFiles\W3SVC6","Folder","Site"
 "CLAMSEN-HP","eShopOnBlazor","IISLogs","C:\inetpub\logs\LogFiles\W3SVC7","Folder","Site"
 "CLAMSEN-HP","eShopOnWeb","IISLogs","C:\inetpub\logs\LogFiles\W3SVC8","Folder","Site"
+"CLAMSEN-HP","SessionDemo","IISLogs","C:\inetpub\logs\LogFiles\W3SVC9","Folder","Site"
 "CLAMSEN-HP","BuggyBits","FrebLogs","C:\inetpub\logs\FailedReqLogFiles\W3SVC2","Folder","Site"
 "CLAMSEN-HP","MyShop","FrebLogs","C:\inetpub\logs\FailedReqLogFiles\W3SVC4","Folder","Site"
 "CLAMSEN-HP","BuggyCore","FrebLogs","C:\inetpub\logs\FailedReqLogFiles\W3SVC5","Folder","Site"
@@ -24,6 +26,6 @@
 "CLAMSEN-HP","System","OS","C:\Windows\System32\winevt\Logs\System.evtx","evtx","Server"
 "CLAMSEN-HP","Security","OS","C:\Windows\System32\winevt\Logs\Security.evtx","evtx","Server"
 "CLAMSEN-HP","Security","OS","C:\Windows\System32\winevt\Logs\Microsoft-Windows-CAPI2%4Operational.evtx","evtx","Server"
-"CLAMSEN-HP","ToolLog","Tool","D:\CSS-Status\LogCatcherV2\ScriptLog\ToolLog.log","File","Server"
-"CLAMSEN-HP","LogDefinition","Tool","D:\CSS-Status\LogCatcherV2\LogsDefinition\LOGS.CSV","File","Server"
+"CLAMSEN-HP","ToolLog","Tool","C:\Users\crnegule\Documents\GitHub\LogCatcher\LogCatcher\ScriptLog\ToolLog.log","File","Server"
+"CLAMSEN-HP","LogDefinition","Tool","C:\Users\crnegule\Documents\GitHub\LogCatcher\LogCatcher\LogsDefinition\LOGS.CSV","File","Server"
 "CLAMSEN-HP","NetPath","OS","C:\Windows\Microsoft.NET\","Folder","Server"
diff --git a/LogCatcher/ScriptLog/ToolLog.log b/LogCatcher/ScriptLog/ToolLog.log