[xharness] Improve logging a bit. (#4952)
* [xharness] Improve logging a bit. * Use timestamp in more log paths. * Create numbered log subdirectories to make things nicer to look at in a terminal (thousands of subdirectories can be annoying to shift through; this way there's an additional subdirectory level). * Avoid string interpolation when not needed.
This commit is contained in:
Родитель
dabd7720d0
Коммит
1f5ba0b5c0
|
@ -126,7 +126,7 @@ namespace xharness
|
||||||
var sims = new Simulators () {
|
var sims = new Simulators () {
|
||||||
Harness = Harness,
|
Harness = Harness,
|
||||||
};
|
};
|
||||||
await sims.LoadAsync (Logs.Create ("simulator-list.log", "Simulator list"));
|
await sims.LoadAsync (Logs.Create ($"simulator-list-{Harness.Timestamp}.log", "Simulator list"));
|
||||||
simulators = await sims.FindAsync (Target, main_log);
|
simulators = await sims.FindAsync (Target, main_log);
|
||||||
|
|
||||||
return simulators != null;
|
return simulators != null;
|
||||||
|
|
|
@ -81,7 +81,7 @@ namespace xharness
|
||||||
Devices.Harness = Harness;
|
Devices.Harness = Harness;
|
||||||
|
|
||||||
if (SimulatorLoadLog == null)
|
if (SimulatorLoadLog == null)
|
||||||
SimulatorLoadLog = Logs.Create ("simulator-list.log", "Simulator Listing");
|
SimulatorLoadLog = Logs.Create ($"simulator-list-{Harness.Timestamp}.log", "Simulator Listing");
|
||||||
|
|
||||||
var simulatorLoadTask = Task.Run (async () => {
|
var simulatorLoadTask = Task.Run (async () => {
|
||||||
try {
|
try {
|
||||||
|
@ -93,7 +93,7 @@ namespace xharness
|
||||||
});
|
});
|
||||||
|
|
||||||
if (DeviceLoadLog == null)
|
if (DeviceLoadLog == null)
|
||||||
DeviceLoadLog = Logs.Create ("device-list.log", "Device Listing");
|
DeviceLoadLog = Logs.Create ($"device-list-{Harness.Timestamp}.log", "Device Listing");
|
||||||
var deviceLoadTask = Task.Run (async () => {
|
var deviceLoadTask = Task.Run (async () => {
|
||||||
try {
|
try {
|
||||||
await Devices.LoadAsync (DeviceLoadLog, removed_locked: true);
|
await Devices.LoadAsync (DeviceLoadLog, removed_locked: true);
|
||||||
|
@ -910,7 +910,7 @@ namespace xharness
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
Directory.CreateDirectory (LogDirectory);
|
Directory.CreateDirectory (LogDirectory);
|
||||||
Log log = Logs.Create ("Harness.log", "Harness log");
|
Log log = Logs.Create ($"Harness-{Harness.Timestamp}.log", "Harness log");
|
||||||
if (Harness.InWrench)
|
if (Harness.InWrench)
|
||||||
log = Log.CreateAggregatedLog (log, new ConsoleLog ());
|
log = Log.CreateAggregatedLog (log, new ConsoleLog ());
|
||||||
Harness.HarnessLog = MainLog = log;
|
Harness.HarnessLog = MainLog = log;
|
||||||
|
@ -1315,7 +1315,7 @@ namespace xharness
|
||||||
|
|
||||||
try {
|
try {
|
||||||
lock (report_lock) {
|
lock (report_lock) {
|
||||||
var report = Path.Combine (LogDirectory, "index.html");
|
var report = Path.Combine (LogDirectory, IsServerMode ? $"index-{Harness.Timestamp}.html" : "index.html");
|
||||||
using (var stream = new MemoryStream ()) {
|
using (var stream = new MemoryStream ()) {
|
||||||
MemoryStream markdown_summary = null;
|
MemoryStream markdown_summary = null;
|
||||||
StreamWriter markdown_writer = null;
|
StreamWriter markdown_writer = null;
|
||||||
|
@ -2369,7 +2369,7 @@ function toggleAll (show)
|
||||||
|
|
||||||
public string LogDirectory {
|
public string LogDirectory {
|
||||||
get {
|
get {
|
||||||
var rv = Path.Combine (Jenkins.LogDirectory, $"{TestName}_{ID}");
|
var rv = Path.Combine (Jenkins.LogDirectory, TestName, ID.ToString ());
|
||||||
Directory.CreateDirectory (rv);
|
Directory.CreateDirectory (rv);
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче