Skip to content

U
ubains-module-test
提交 a6c00128 authored 作者: 陈泽健's avatar 陈泽健
浏览文件
操作

fix(script): 修复SSL证书日期解析和堆内存检测问题 

- 优化SSL证书日期解析逻辑，使用ParseExact方法提高准确性
- 添加多种日期格式支持，包括带GMT和不带GMT的格式
- 改进异常处理机制，避免日期解析失败导致脚本中断
- 修复堆内存设置检测，过滤错误信息并确保返回有效值
- 统一代码风格，增加注释说明日期格式解析规则
上级 82e213b2
显示空白字符变更
内嵌 并排
正在显示 包含 63 行增加 和 35 行删除
AuxiliaryTool/ScriptTool/新服务自检/check_server_health.ps1
浏览文件 @ a6c00128
...@@ -1432,28 +1432,39 @@ function Test-TimeSync { ...@@ -1432,28 +1432,39 @@ function Test-TimeSync {
if ($certCheck -match "notAfter=(.+)") { if ($certCheck -match "notAfter=(.+)") {
$expiryDateStr = $Matches[1].Trim() $expiryDateStr = $Matches[1].Trim()
try { try {
# 尝试多种日期格式解析（兼容PowerShell 5.x） # OpenSSL证书日期格式: "MMM dd HH:mm:ss yyyy GMT" 或 "MMM d HH:mm:ss yyyy GMT"
# 使用ParseExact + InvariantCulture解析（兼容中文系统）
$expiryDate = $null $expiryDate = $null
$formats = @(
"MMM dd HH:mm:ss yyyy GMT",
"MMM d HH:mm:ss yyyy GMT",
"yyyy-MM-dd HH:mm:ss",
"yyyy/MM/dd HH:mm:ss"
)
foreach ($fmt in $formats) { # 先尝试带GMT后缀的格式
$culture = [System.Globalization.CultureInfo]::InvariantCulture try {
$style = [System.Globalization.DateTimeStyles]::None $expiryDate = [DateTime]::ParseExact($expiryDateStr, "MMM dd HH:mm:ss yyyy GMT", [System.Globalization.CultureInfo]::InvariantCulture)
if ([DateTime]::TryParseExact($expiryDateStr, $fmt, $culture, $style, [ref]$expiryDate)) { }
break catch {
# 如果失败，尝试单数日期格式（双空格）
try {
$expiryDate = [DateTime]::ParseExact($expiryDateStr, "MMM d HH:mm:ss yyyy GMT", [System.Globalization.CultureInfo]::InvariantCulture)
}
catch {
# 如果还是失败，尝试不带GMT的格式
$withoutGMT = $expiryDateStr -replace "\s+GMT$", ""
try {
$expiryDate = [DateTime]::ParseExact($withoutGMT, "MMM dd HH:mm:ss yyyy", [System.Globalization.CultureInfo]::InvariantCulture)
}
catch {
# 最后尝试单数日期不带GMT
try {
$expiryDate = [DateTime]::ParseExact($withoutGMT, "MMM d HH:mm:ss yyyy", [System.Globalization.CultureInfo]::InvariantCulture)
}
catch {
Write-Log "SSL证书日期解析失败: $expiryDateStr" "WARN"
}
} }
} }
# 如果上述格式都失败，尝试通用解析
if (-not $expiryDate) {
$expiryDate = [DateTime]::Parse($expiryDateStr)
} }
if ($expiryDate) {
$daysLeft = ($expiryDate - [DateTime]::Now).Days $daysLeft = ($expiryDate - [DateTime]::Now).Days
if ($daysLeft -lt 0) { if ($daysLeft -lt 0) {
...@@ -1486,6 +1497,10 @@ function Test-TimeSync { ...@@ -1486,6 +1497,10 @@ function Test-TimeSync {
Add-Issue -Message "SSL证书${certStatusText}: $daysLeft 天" -Level $status Add-Issue -Message "SSL证书${certStatusText}: $daysLeft 天" -Level $status
} }
} }
else {
Write-Log "SSL证书日期解析失败: $expiryDateStr" "WARN"
}
}
catch { catch {
Write-Log "SSL证书日期解析失败: $expiryDateStr - $($_.Exception.Message)" "WARN" Write-Log "SSL证书日期解析失败: $expiryDateStr - $($_.Exception.Message)" "WARN"
} }
...@@ -1499,28 +1514,39 @@ function Test-TimeSync { ...@@ -1499,28 +1514,39 @@ function Test-TimeSync {
if ($emqxCertCheck -match "notAfter=(.+)") { if ($emqxCertCheck -match "notAfter=(.+)") {
$expiryDateStr = $Matches[1].Trim() $expiryDateStr = $Matches[1].Trim()
try { try {
# 尝试多种日期格式解析（兼容PowerShell 5.x） # OpenSSL证书日期格式: "MMM dd HH:mm:ss yyyy GMT"
# 使用ParseExact + InvariantCulture解析（兼容中文系统）
$expiryDate = $null $expiryDate = $null
$formats = @(
"MMM dd HH:mm:ss yyyy GMT",
"MMM d HH:mm:ss yyyy GMT",
"yyyy-MM-dd HH:mm:ss",
"yyyy/MM/dd HH:mm:ss"
)
foreach ($fmt in $formats) { # 先尝试带GMT后缀的格式
$culture = [System.Globalization.CultureInfo]::InvariantCulture try {
$style = [System.Globalization.DateTimeStyles]::None $expiryDate = [DateTime]::ParseExact($expiryDateStr, "MMM dd HH:mm:ss yyyy GMT", [System.Globalization.CultureInfo]::InvariantCulture)
if ([DateTime]::TryParseExact($expiryDateStr, $fmt, $culture, $style, [ref]$expiryDate)) { }
break catch {
# 如果失败，尝试单数日期格式（双空格）
try {
$expiryDate = [DateTime]::ParseExact($expiryDateStr, "MMM d HH:mm:ss yyyy GMT", [System.Globalization.CultureInfo]::InvariantCulture)
}
catch {
# 如果还是失败，尝试不带GMT的格式
$withoutGMT = $expiryDateStr -replace "\s+GMT$", ""
try {
$expiryDate = [DateTime]::ParseExact($withoutGMT, "MMM dd HH:mm:ss yyyy", [System.Globalization.CultureInfo]::InvariantCulture)
}
catch {
# 最后尝试单数日期不带GMT
try {
$expiryDate = [DateTime]::ParseExact($withoutGMT, "MMM d HH:mm:ss yyyy", [System.Globalization.CultureInfo]::InvariantCulture)
}
catch {
Write-Log "EMQX SSL证书日期解析失败: $expiryDateStr" "WARN"
}
} }
} }
# 如果上述格式都失败，尝试通用解析
if (-not $expiryDate) {
$expiryDate = [DateTime]::Parse($expiryDateStr)
} }
if ($expiryDate) {
$daysLeft = ($expiryDate - [DateTime]::Now).Days $daysLeft = ($expiryDate - [DateTime]::Now).Days
if ($daysLeft -lt 7) { if ($daysLeft -lt 7) {
...@@ -1541,8 +1567,9 @@ function Test-TimeSync { ...@@ -1541,8 +1567,9 @@ function Test-TimeSync {
Message = "EMQX SSL证书有效期至 $expiryDateStr" Message = "EMQX SSL证书有效期至 $expiryDateStr"
} }
} }
}
catch { catch {
Write-Log "EMQX SSL证书日期解析失败: $expiryDateStr - $($_.Exception.Message)" "WARN" Write-Log "EMQX SSL证书日期处理失败: $($_.Exception.Message)" "WARN"
} }
} }
} }
...@@ -2440,11 +2467,12 @@ function Test-JavaApplication { ...@@ -2440,11 +2467,12 @@ function Test-JavaApplication {
# 堆内存设置检测 # 堆内存设置检测
$heapSettings = Invoke-SSHCommand "docker exec ujava2 ps aux | grep java | grep -oE '-Xm[sx][0-9A-Za-z]+' | head -3" -Timeout 10 $heapSettings = Invoke-SSHCommand "docker exec ujava2 ps aux | grep java | grep -oE '-Xm[sx][0-9A-Za-z]+' | head -3" -Timeout 10
if ($heapSettings) { if ($heapSettings -and $heapSettings -notmatch "error|Error|ERROR") {
if ($heapSettings -is [array]) { $heapSettings = $heapSettings -join " " } if ($heapSettings -is [array]) { $heapSettings = $heapSettings -join " " }
$heapSettingsString = "$heapSettings".Trim()
$results += [PSCustomObject]@{ $results += [PSCustomObject]@{
Name = "堆内存设置" Name = "堆内存设置"
Value = $heapSettings.Trim() Value = $heapSettingsString
Threshold = "-" Threshold = "-"
Status = "正常" Status = "正常"
Message = "JVM堆内存参数配置" Message = "JVM堆内存参数配置"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论