Release v1.3.1 single router log cleanup

Author: GhostwheeI

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.3.1 - 2026-05-16
+
+Router log cleanup release.
+
+### Changed
+
+- Router traffic in the selected log folder now goes to one fixed log file: `router-current.log`.
+- Legacy `sources` logs are merged into the single router log during layout migration.
+- Legacy `server` logs are moved into the internal runtime diagnostics area under `C:\ProgramData\GW-Router-Logger\diagnostics\listener-runtime`.
+- Tray self-test no longer recreates `sources` and `server` inside the chosen router log folder.
+
 ## v1.3.0 - 2026-05-16
 
 Single-entrypoint tray integration release.

GW-Router-Logger.TrayMode.psm1

@@ -3,13 +3,14 @@
 # installs only expose one app script to the user.
 
 $script:AppName = 'GW Router Logger'
-$script:Version = '1.3.0'
+$script:Version = '1.3.1'
 $script:Publisher = 'Ghostwheel'
 $script:GitHubOwner = 'GhostwheeI'
 $script:GitHubRepo = 'GW-Router-Logger'
 $script:DefaultUdpPort = 514
 $script:DefaultTcpPort = 514
 $script:DefaultTcpEnabled = $false
+$script:RouterLogBaseName = 'router-current'
 $script:ActiveLogRotateBytes = 5MB
 $script:ActiveLogRotateMinutes = 60
 $script:MaxCompressedBytes = 100MB
@@ -723,6 +724,40 @@ function Move-DirectoryContents {
     }
 }
 
+function Merge-TextFileIntoPath {
+    param(
+        [Parameter(Mandatory = $true)] [string] $SourcePath,
+        [Parameter(Mandatory = $true)] [string] $DestinationPath
+    )
+
+    if (-not (Test-Path -LiteralPath $SourcePath)) {
+        return
+    }
+
+    if ([IO.Path]::GetFullPath($SourcePath).TrimEnd('\') -eq [IO.Path]::GetFullPath($DestinationPath).TrimEnd('\')) {
+        return
+    }
+
+    $destinationDirectory = Split-Path -Path $DestinationPath -Parent
+    Ensure-Directory -Path $destinationDirectory | Out-Null
+
+    if (-not (Test-Path -LiteralPath $DestinationPath)) {
+        Move-Item -LiteralPath $SourcePath -Destination $DestinationPath -Force -ErrorAction SilentlyContinue
+        return
+    }
+
+    $sourceContent = Get-Content -LiteralPath $SourcePath -Raw -ErrorAction SilentlyContinue
+    if (-not [string]::IsNullOrEmpty($sourceContent)) {
+        $destinationHasContent = ((Get-Item -LiteralPath $DestinationPath -ErrorAction SilentlyContinue).Length -gt 0)
+        if ($destinationHasContent) {
+            Add-Content -LiteralPath $DestinationPath -Value '' -Encoding UTF8
+        }
+        Add-Content -LiteralPath $DestinationPath -Value $sourceContent -Encoding UTF8
+    }
+
+    Remove-Item -LiteralPath $SourcePath -Force -ErrorAction SilentlyContinue
+}
+
 function Remove-DirectoryIfEmpty {
     param([string] $Path)
 
@@ -757,7 +792,7 @@ function Resolve-LogLayout {
     if (Test-Path -LiteralPath $legacySourceRoot) {
         $sourceFiles = @(Get-ChildItem -LiteralPath $legacySourceRoot -Force -File -ErrorAction SilentlyContinue)
         foreach ($file in $sourceFiles) {
-            Move-Item -LiteralPath $file.FullName -Destination (Join-Path -Path $Settings.SourceLogRoot -ChildPath $file.Name) -Force -ErrorAction SilentlyContinue
+            Merge-TextFileIntoPath -SourcePath $file.FullName -DestinationPath (Join-Path -Path $Settings.SourceLogRoot -ChildPath ($script:RouterLogBaseName + '.log'))
         }
     }
     if (Test-Path -LiteralPath $legacyServerArchiveRoot) {
@@ -1078,7 +1113,7 @@ function New-ListenerScriptBlock {
                 $archiveRoot = Join-Path -Path $Settings.RuntimeLogRoot -ChildPath 'archive'
             }
             else {
-                $targetPath = Get-SafeLogPath -Directory $Settings.SourceLogRoot -BaseName ($SourceName + '-current') -Suffix '.log'
+                $targetPath = Get-SafeLogPath -Directory $Settings.SourceLogRoot -BaseName $script:RouterLogBaseName -Suffix '.log'
                 $archiveRoot = Join-Path -Path $Settings.LogRoot -ChildPath 'archive'
             }
 
@@ -1935,9 +1970,7 @@ function Build-ContextMenu {
 
 function Invoke-SelfTest {
     $config = Get-AppConfig
-    Ensure-Directory -Path $config.LogRoot | Out-Null
-    Ensure-Directory -Path (Join-Path -Path $config.LogRoot -ChildPath 'sources') | Out-Null
-    Ensure-Directory -Path (Join-Path -Path $config.LogRoot -ChildPath 'server') | Out-Null
+    Resolve-LogLayout -Settings $config
     Write-AppLog -Message 'Self-test diagnostic log entry.' -Diagnostic
     'SELFTEST_OK'
 }

GW-Router-Logger.ps1

@@ -25,14 +25,15 @@ catch {
 # These script-scoped values act as the main tuning points for future maintenance.
 # Keeping them together makes it easier to adjust behavior without searching the file.
 $script:AppName = 'GW Router Logger'
-$script:Version = '1.3.0'
+$script:Version = '1.3.1'
 $script:MaxCompressedBytes = 100MB
 $script:ActiveLogRotateBytes = 5MB
 $script:ActiveLogRotateMinutes = 60
 $script:RecentEventsMax = 12
 $script:StatusRefreshMilliseconds = 2000
 $script:DefaultUdpPort = 514
 $script:DefaultTcpPort = 514
+$script:RouterLogBaseName = 'router-current'
 $script:DefaultResolveHostNames = $false
 $script:DnsLookupTimeoutMilliseconds = 250
 $script:SourceNameCacheTtlMinutes = 30
@@ -254,6 +255,40 @@ function Move-DirectoryContents {
     }
 }
 
+function Merge-TextFileIntoPath {
+    param(
+        [Parameter(Mandatory = $true)] [string] $SourcePath,
+        [Parameter(Mandatory = $true)] [string] $DestinationPath
+    )
+
+    if (-not (Test-Path -LiteralPath $SourcePath)) {
+        return
+    }
+
+    if ([IO.Path]::GetFullPath($SourcePath).TrimEnd('\') -eq [IO.Path]::GetFullPath($DestinationPath).TrimEnd('\')) {
+        return
+    }
+
+    $destinationDirectory = Split-Path -Path $DestinationPath -Parent
+    Ensure-Directory -Path $destinationDirectory | Out-Null
+
+    if (-not (Test-Path -LiteralPath $DestinationPath)) {
+        Move-Item -LiteralPath $SourcePath -Destination $DestinationPath -Force -ErrorAction SilentlyContinue
+        return
+    }
+
+    $sourceContent = Get-Content -LiteralPath $SourcePath -Raw -ErrorAction SilentlyContinue
+    if (-not [string]::IsNullOrEmpty($sourceContent)) {
+        $destinationHasContent = ((Get-Item -LiteralPath $DestinationPath -ErrorAction SilentlyContinue).Length -gt 0)
+        if ($destinationHasContent) {
+            Add-Content -LiteralPath $DestinationPath -Value '' -Encoding UTF8
+        }
+        Add-Content -LiteralPath $DestinationPath -Value $sourceContent -Encoding UTF8
+    }
+
+    Remove-Item -LiteralPath $SourcePath -Force -ErrorAction SilentlyContinue
+}
+
 function Remove-DirectoryIfEmpty {
     param([string] $Path)
 
@@ -288,7 +323,7 @@ function Resolve-LogLayout {
     if (Test-Path -LiteralPath $legacySourceRoot) {
         $sourceFiles = @(Get-ChildItem -LiteralPath $legacySourceRoot -Force -File -ErrorAction SilentlyContinue)
         foreach ($file in $sourceFiles) {
-            Move-Item -LiteralPath $file.FullName -Destination (Join-Path -Path $Settings.SourceLogRoot -ChildPath $file.Name) -Force -ErrorAction SilentlyContinue
+            Merge-TextFileIntoPath -SourcePath $file.FullName -DestinationPath (Join-Path -Path $Settings.SourceLogRoot -ChildPath ($script:RouterLogBaseName + '.log'))
         }
     }
     if (Test-Path -LiteralPath $legacyServerArchiveRoot) {
@@ -851,7 +886,7 @@ function Write-LogRecord {
         $archiveRoot = Join-Path -Path $Settings.ServerLogRoot -ChildPath 'archive'
     }
     else {
-        $targetPath = Get-SafeLogPath -Directory $Settings.SourceLogRoot -BaseName ($SourceName + '-current') -Suffix '.log'
+        $targetPath = Get-SafeLogPath -Directory $Settings.SourceLogRoot -BaseName $script:RouterLogBaseName -Suffix '.log'
         $archiveRoot = Join-Path -Path $Settings.LogRoot -ChildPath 'archive'
     }
 

Install-GWRouterLogger.ps1

@@ -12,7 +12,7 @@ param(
 
 $ErrorActionPreference = 'Stop'
 $appName = 'GW Router Logger'
-$version = '1.3.0'
+$version = '1.3.1'
 $publisher = 'Ghostwheel'
 
 function Test-IsAdministrator {

README.md

@@ -2,7 +2,7 @@
 
 `GW Router Logger` is a PowerShell syslog collector for Windows, designed for home labs, residential routers, and small-network troubleshooting.
 
-Current release: `v1.3.0`
+Current release: `v1.3.1`
 
 It focuses on the things that usually break first on normal Windows machines: elevation, pathing, firewall access, bind-address selection, log rollover, and clear on-screen status.
 
@@ -28,7 +28,7 @@ This script does the opposite. It guides setup, validates inputs, uses practical
 - Residential-friendly defaults: `UDP 514`, `TCP disabled`
 - Automatic suggestion of the local IPv4 address tied to the active default gateway
 - Live status dashboard with message counts, sender tracking, and recent events
-- Per-source log files plus a server/runtime log
+- One router log file in the selected log folder, with internal runtime logs kept separately
 - Rolling archive management with compression and a compressed retention cap
 - Cached, bounded hostname lookup so slow reverse DNS does not stall the listener
 - Stale TCP client cleanup for long-running sessions
@@ -113,7 +113,7 @@ The log folder you choose is now reserved for router-received logs. Internal run
 
 ```text
 GW-ROUTER-LOGS\
-  192.168.50.1-current.log
+  router-current.log
   archive\
 ```