fix: 发布一致性校验、日志轮转与构建脚本对齐
- 新增发布校验脚本(buildsh/lib/verify_release.py + release.sh),核对 tag/清单/资产 三者的 sha256 与体积,并复验清单签名;接入 ./build.sh release-verify 与 .gitea/workflows/release-verify.yml(手动触发) - GcLog 改为常驻 StreamWriter + 按天轮转 + 14 天/64MB 保留策略,避免高峰期反复 开关文件句柄;只清理本模块生成的 gc-*.log,不碰用户文件 - 修复 Applier 验签逻辑:无效签名永远拒绝,仅「未签名」在调用方不强制时放行 - 新增应用器测试(GC.Savedog.Tests):整目录替换、.GC/bin 合并、启动失败回滚、 路径穿越防护、验签;接入 pr-check.yml - GC.Tests 增加日志用例(写入/轮转/清理/用户文件保护) - 同步 PowerShell 打包脚本与 buildsh 一致:GCL 命名、单顶层目录、守护进程收进 .GC/bin、启动器与守护进程压缩单文件、不预置 .GC、prune/strip 对齐、签名 keyId 改为 gc-2026-12、新增 release-verify 与应用器测试任务
This commit is contained in:
1 parent
a5fcaeb658
commit
59a66c8fa8
15 files changed
+981
-93
No files matched your search
+124
-12
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
|
||||
@@ -15,15 +16,30 @@ namespace GC.Services;
|
||||
/// 中英分开而不是写在一个文件里:用户排查时不用在一行里找自己看得懂的那半句;
|
||||
/// 也给反馈问题时直接发对应语言的文件即可。
|
||||
///
|
||||
/// 写入方式:常驻 <see cref="StreamWriter"/>(<c>AutoFlush</c> 打开,崩溃也不丢最后几行),
|
||||
/// 不再每行 open/append/close 一遍 —— 那条路径每写一行要开两个文件句柄,
|
||||
/// 在下载 / 启动高峰期会明显拖慢调用方。
|
||||
///
|
||||
/// 保留策略:<see cref="RetentionDays"/> 天之前的日志在初始化与跨天滚动时删除;
|
||||
/// 总量超过 <see cref="MaxTotalBytes"/> 时从最旧的开始删。日志目录不会无限长。
|
||||
///
|
||||
/// 日志失败绝不影响主流程(磁盘满、只读目录都只是少一份日志)。
|
||||
/// </summary>
|
||||
public static class GcLog
|
||||
{
|
||||
/// <summary>日志保留天数。</summary>
|
||||
public const int RetentionDays = 14;
|
||||
|
||||
/// <summary>日志目录总量上限(中英两份合计)。</summary>
|
||||
public const long MaxTotalBytes = 64L * 1024 * 1024;
|
||||
|
||||
private static readonly object Gate = new();
|
||||
private const string FilePrefix = "gc-";
|
||||
|
||||
private static string? _dir;
|
||||
private static string _day = "";
|
||||
private static string _zhPath = "";
|
||||
private static string _enPath = "";
|
||||
private static StreamWriter? _zh;
|
||||
private static StreamWriter? _en;
|
||||
|
||||
public static bool Enabled
|
||||
{
|
||||
@@ -45,8 +61,10 @@ public static class GcLog
|
||||
|
||||
lock (Gate)
|
||||
{
|
||||
CloseWriters();
|
||||
_dir = dir;
|
||||
_day = "";
|
||||
PruneOldFiles(dir);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,10 +76,8 @@ public static class GcLog
|
||||
{
|
||||
var now = DateTime.Now;
|
||||
var prefix = $"{now:yyyy-MM-dd HH:mm:ss} [{level}] ";
|
||||
var lineZh = prefix + zh;
|
||||
var lineEn = prefix + en;
|
||||
|
||||
try { Console.WriteLine(lineZh); } catch { /* 无控制台 */ }
|
||||
try { Console.WriteLine(prefix + zh); } catch { /* 无控制台 */ }
|
||||
|
||||
lock (Gate)
|
||||
{
|
||||
@@ -70,25 +86,121 @@ public static class GcLog
|
||||
var day = now.ToString("yyyyMMdd");
|
||||
if (day != _day)
|
||||
{
|
||||
// 跨天换文件;顺便清一次旧日志,长时间挂机的进程也不会攒满磁盘
|
||||
CloseWriters();
|
||||
_day = day;
|
||||
_zhPath = Path.Combine(_dir, $"gc-{day}.log");
|
||||
_enPath = Path.Combine(_dir, $"gc-{day}.en.log");
|
||||
PruneOldFiles(_dir);
|
||||
}
|
||||
|
||||
Append(_zhPath, lineZh);
|
||||
Append(_enPath, lineEn);
|
||||
if (_zh == null)
|
||||
{
|
||||
_zh = OpenWriter(Path.Combine(_dir, $"{FilePrefix}{day}.log"));
|
||||
_en = OpenWriter(Path.Combine(_dir, $"{FilePrefix}{day}.en.log"));
|
||||
}
|
||||
|
||||
Append(_zh, prefix + zh);
|
||||
Append(_en, prefix + en);
|
||||
}
|
||||
}
|
||||
|
||||
private static void Append(string path, string line)
|
||||
private static StreamWriter? OpenWriter(string path)
|
||||
{
|
||||
try
|
||||
{
|
||||
File.AppendAllText(path, line + Environment.NewLine, new UTF8Encoding(false));
|
||||
var stream = new FileStream(path, FileMode.Append, FileAccess.Write, FileShare.ReadWrite);
|
||||
return new StreamWriter(stream, new UTF8Encoding(false)) { AutoFlush = true };
|
||||
}
|
||||
catch
|
||||
{
|
||||
// 日志失败不能影响程序
|
||||
// 写不了就不写;下一次跨天会再试一次
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static void Append(StreamWriter? writer, string line)
|
||||
{
|
||||
if (writer == null) return;
|
||||
try
|
||||
{
|
||||
writer.WriteLine(line);
|
||||
}
|
||||
catch
|
||||
{
|
||||
// 磁盘满 / 文件被删:关掉写入器,下次跨天重建
|
||||
try { writer.Dispose(); } catch { }
|
||||
if (ReferenceEquals(writer, _zh)) _zh = null; else _en = null;
|
||||
}
|
||||
}
|
||||
|
||||
private static void CloseWriters()
|
||||
{
|
||||
try { _zh?.Dispose(); } catch { }
|
||||
try { _en?.Dispose(); } catch { }
|
||||
_zh = null;
|
||||
_en = null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 清理过期与超量日志。只动本模块自己写的 <c>gc-YYYYMMDD[.en].log</c>,
|
||||
/// 目录里用户放的其他文件一概不碰。
|
||||
/// </summary>
|
||||
private static void PruneOldFiles(string dir)
|
||||
{
|
||||
try
|
||||
{
|
||||
var files = new DirectoryInfo(dir).GetFiles(FilePrefix + "*.log");
|
||||
if (files.Length == 0) return;
|
||||
|
||||
var cutoff = DateTime.Now.Date.AddDays(-RetentionDays);
|
||||
var alive = new System.Collections.Generic.List<FileInfo>(files.Length);
|
||||
foreach (var file in files)
|
||||
{
|
||||
if (!TryReadDate(file.Name, out var date))
|
||||
{
|
||||
// 名字不是我们的格式,忽略(既不删也不计入配额)
|
||||
continue;
|
||||
}
|
||||
|
||||
if (date < cutoff)
|
||||
{
|
||||
try { file.Delete(); } catch { }
|
||||
continue;
|
||||
}
|
||||
|
||||
alive.Add(file);
|
||||
}
|
||||
|
||||
long total = 0;
|
||||
foreach (var file in alive) total += file.Length;
|
||||
if (total <= MaxTotalBytes) return;
|
||||
|
||||
alive.Sort((a, b) => a.LastWriteTimeUtc.CompareTo(b.LastWriteTimeUtc));
|
||||
foreach (var file in alive)
|
||||
{
|
||||
if (total <= MaxTotalBytes) break;
|
||||
try
|
||||
{
|
||||
total -= file.Length;
|
||||
file.Delete();
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
// 清理失败不影响写日志
|
||||
}
|
||||
}
|
||||
|
||||
private static bool TryReadDate(string name, out DateTime date)
|
||||
{
|
||||
date = default;
|
||||
// gc-20261118.log / gc-20261118.en.log
|
||||
if (!name.StartsWith(FilePrefix, StringComparison.Ordinal)) return false;
|
||||
var rest = name.Substring(FilePrefix.Length);
|
||||
var dot = rest.IndexOf('.');
|
||||
if (dot != 8) return false;
|
||||
return DateTime.TryParseExact(rest.Substring(0, 8), "yyyyMMdd",
|
||||
CultureInfo.InvariantCulture, DateTimeStyles.None, out date);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user