Node.Cli: all primary functions as working, a few minor things to finish (err handling/logging, hello methods)

Author: steveshortt

Synapse.NodeService.HttpClient/NodeServiceHttpApiClient.cs

@@ -1,9 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 
-using Synapse.Core;
 using Synapse.Common.WebApi;
-using System.Collections.Generic;
+using Synapse.Core;
+using Synapse.Core.Utilities;
 
 namespace Synapse.Services
 {
@@ -16,6 +18,40 @@ public NodeServiceHttpApiClient(string baseUrl, string messageFormatType = "appl
         }
 
 
+        public ExecuteResult StartPlanFile(int planInstanceId, bool dryRun, string filePath)
+        {
+            return StartPlanAsync( planInstanceId, dryRun, filePath ).Result;
+        }
+
+        public async Task<ExecuteResult> StartPlanFileAsync(int planInstanceId, bool dryRun, string filePath)
+        {
+            if( File.Exists( filePath ) )
+            {
+                Plan plan = YamlHelpers.DeserializeFile<Plan>( filePath );
+                string requestUri = $"{_rootPath}/execute/{planInstanceId}/?action=start&dryRun={dryRun}";
+                return await PostAsync<Plan, ExecuteResult>( plan, requestUri );
+            }
+            else
+                throw new FileNotFoundException( "Unable to start Plan.", filePath );
+        }
+
+        public ExecuteResult StartPlan(int planInstanceId, bool dryRun, string filePath)
+        {
+            return StartPlanAsync( planInstanceId, dryRun, filePath ).Result;
+        }
+
+        public async Task<ExecuteResult> StartPlanAsync(int planInstanceId, bool dryRun, string filePath)
+        {
+            if( File.Exists( filePath ) )
+            {
+                Plan plan = YamlHelpers.DeserializeFile<Plan>( filePath );
+                string requestUri = $"{_rootPath}/execute/{planInstanceId}/?action=start&dryRun={dryRun}";
+                return await PostAsync<Plan, ExecuteResult>( plan, requestUri );
+            }
+            else
+                throw new FileNotFoundException( "Unable to start Plan.", filePath );
+        }
+
         public ExecuteResult StartPlan(int planInstanceId, bool dryRun, Plan plan)
         {
             return StartPlanAsync( planInstanceId, dryRun, plan ).Result;

Synapse.NodeService.cli/Program.cs

@@ -43,8 +43,8 @@ static void Main(string[] args)
 
         public Program()
         {
-            _methods.Add( "start", "StartPlan" );
-            _methods.Add( "s", "StartPlan" );
+            _methods.Add( "start", "StartPlanFile" );
+            _methods.Add( "s", "StartPlanFile" );
             _methods.Add( "cancel", "CancelPlan" );
             _methods.Add( "c", "CancelPlan" );
             _methods.Add( "drainstop", "Drainstop" );

Synapse.NodeService/Classes/SynapseNodeServer.cs

@@ -2,6 +2,8 @@
 using Synapse.Core;
 using Synapse.Core.Runtime;
 using System.Collections.Generic;
+using System.Text;
+using Synapse.Common.WebApi;
 
 namespace Synapse.Services
 {
@@ -40,7 +42,20 @@ public string WhosHere()
 
         public ExecuteResult StartPlan(string planInstanceId, bool dryRun, Plan plan)
         {
-            return plan.Start( null, dryRun );
+            string context = GetContext( nameof( StartPlan ),
+                nameof( plan ), plan.Name, nameof( dryRun ), dryRun, nameof( planInstanceId ), planInstanceId );
+
+            try
+            {
+                SynapseNodeService.Logger.Debug( context );
+                return plan.Start( null, dryRun );
+            }
+            catch( Exception ex )
+            {
+                SynapseNodeService.Logger.Error(
+                    Utilities.UnwindException( context, ex, asSingleLine: true ) );
+                throw;
+            }
         }
 
         public void StartPlanAsync(string planInstanceId, bool dryRun, Plan plan)
@@ -93,5 +108,16 @@ public void Undrainstop()
 
         public List<string> GetCurrentQueueItems() { return _scheduler.CurrentQueue; }
         #endregion
+
+
+        string GetContext(string context, params object[] parms)
+        {
+            StringBuilder c = new StringBuilder();
+            c.Append( $"{context}(" );
+            for( int i = 0; i < parms.Length; i += 2 )
+                c.Append( $"{parms[i]}: {parms[i + 1]}, " );
+
+            return $"{c.ToString().TrimEnd( ',', ' ' )})";
+        }
     }
 }