From e0d366b10d5eb1a47122b8fb4d133f5a3902a8dd Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Mon, 4 Jul 2022 15:52:47 +0100 Subject: [PATCH] Log exception msg and stack trace (#42) * Log exception msg and stack trace * Bump SDK version due to CA issues --- .github/workflows/ci.yml | 2 +- global.json | 2 +- .../EphemeralClusterComposer.cs | 14 ++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9daea5e..6f3aa45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: git tag --list - uses: actions/setup-dotnet@v1 with: - dotnet-version: '5.0.100' + dotnet-version: '5.0.408' source-url: https://nuget.pkg.github.com/elastic/index.json env: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/global.json b/global.json index 2675d76..a3c9d40 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "5.0.100", + "version": "5.0.408", "rollForward": "latestFeature", "allowPrerelease": false } diff --git a/src/Elastic.Elasticsearch.Ephemeral/EphemeralClusterComposer.cs b/src/Elastic.Elasticsearch.Ephemeral/EphemeralClusterComposer.cs index d9ec224..c0000af 100644 --- a/src/Elastic.Elasticsearch.Ephemeral/EphemeralClusterComposer.cs +++ b/src/Elastic.Elasticsearch.Ephemeral/EphemeralClusterComposer.cs @@ -12,6 +12,7 @@ using Elastic.Elasticsearch.Ephemeral.Tasks.InstallationTasks.XPack; using Elastic.Elasticsearch.Ephemeral.Tasks.ValidationTasks; using Elastic.Elasticsearch.Managed.FileSystem; +using Elastic.Elasticsearch.Managed.ConsoleWriters; namespace Elastic.Elasticsearch.Ephemeral { @@ -73,9 +74,9 @@ public class EphemeralClusterComposer : EphemeralClusterComposer private bool NodeStarted { get; set; } - public void OnStop() => Itterate(NodeStoppedTasks, (t, c, fs) => t.Run(c, NodeStarted), false); + public void OnStop() => Iterate(NodeStoppedTasks, (t, c, fs) => t.Run(c, NodeStarted), false); - public void Install() => Itterate(InstallationTasks, (t, c, fs) => t.Run(c)); + public void Install() => Iterate(InstallationTasks, (t, c, fs) => t.Run(c)); public void OnBeforeStart() { @@ -86,7 +87,7 @@ public void OnBeforeStart() if (Cluster.ClusterConfiguration.PrintYamlFilesInConfigFolder) tasks.Add(new PrintYamlContents()); - Itterate(tasks, (t, c, fs) => t.Run(c)); + Iterate(tasks, (t, c, fs) => t.Run(c)); NodeStarted = true; } @@ -97,10 +98,10 @@ public void OnAfterStart() var tasks = new List(AfterStartedTasks); if (Cluster.ClusterConfiguration.AdditionalAfterStartedTasks != null) tasks.AddRange(Cluster.ClusterConfiguration.AdditionalAfterStartedTasks); - Itterate(tasks, (t, c, fs) => t.Run(c), false); + Iterate(tasks, (t, c, fs) => t.Run(c), false); } - private void Itterate(IEnumerable collection, + private void Iterate(IEnumerable collection, Action, INodeFileSystem> act, bool callOnStop = true) { lock (_lock) @@ -111,9 +112,10 @@ private void Itterate(IEnumerable collection, { act(task, cluster, cluster.FileSystem); } - catch (Exception) + catch (Exception ex) { if (callOnStop) OnStop(); + cluster.Writer.WriteError($"{ex.Message}{Environment.NewLine}{ex.StackTrace}"); throw; } }