Merge pull request #177 from mcrossley/master

v3.25.1
cumulusmx · May 13, 2023 · 49979ee · 49979ee
2 parents 86f3e7f + 9041938
commit 49979ee
Show file tree

Hide file tree

Showing 27 changed files with 730 additions and 959 deletions.
diff --git a/CumulusMX/Alarm.cs b/CumulusMX/Alarm.cs
@@ -118,8 +118,7 @@ private void doTriggered(bool value)
 							try
 							{
 								// Prepare the process to run
-								var parser = new TokenParser();
-								parser.OnToken += cumulus.TokenParserOnToken;
+								var parser = new TokenParser(cumulus.TokenParserOnToken);
 								parser.InputText = ActionParams;
 								var args = parser.ToStringFromString();
 								cumulus.LogMessage($"Alarm ({Name}): Starting external program: '{Action}', with parameters: {args}");
@@ -276,8 +275,7 @@ private void doUpTriggered(bool value)
 						try
 						{
 							// Prepare the process to run
-							var parser = new TokenParser();
-							parser.OnToken += cumulus.TokenParserOnToken;
+							var parser = new TokenParser(cumulus.TokenParserOnToken);
 							parser.InputText = ActionParams;
 							var args = parser.ToStringFromString();
 							cumulus.LogMessage($"Alarm ({Name}): Starting external program: '{Action}', with parameters: {args}");
@@ -351,8 +349,7 @@ private void doDownTriggered(bool value)
 						try
 						{
 							// Prepare the process to run
-							var parser = new TokenParser();
-							parser.OnToken += cumulus.TokenParserOnToken;
+							var parser = new TokenParser(cumulus.TokenParserOnToken);
 							parser.InputText = ActionParams;
 							var args = parser.ToStringFromString();
 							cumulus.LogMessage($"Alarm ({Name}): Starting external program: '{Action}', with parameters: {args}");

diff --git a/CumulusMX/ApiTagProcessor.cs b/CumulusMX/ApiTagProcessor.cs
@@ -9,15 +9,11 @@ namespace CumulusMX
 	public class ApiTagProcessor
 	{
 		private readonly Cumulus cumulus;
-		private readonly TokenParser tokenParser;
 		private WebTags webtags;
 
 		internal ApiTagProcessor(Cumulus cumulus)
 		{
 			this.cumulus = cumulus;
-			tokenParser = new TokenParser();
-			tokenParser.OnToken += cumulus.TokenParserOnToken;
-			tokenParser.Encoding = new UTF8Encoding(false);
 		}
 
 		internal void SetWebTags(WebTags webtags)
@@ -91,6 +87,8 @@ public string ProcessText(IHttpRequest request)
 
 				cumulus.LogDataMessage($"API tag: Source = {request.RemoteEndPoint} Input string = {data}");
 
+				var tokenParser = new TokenParser(cumulus.TokenParserOnToken);
+				tokenParser.Encoding = new UTF8Encoding(false);
 				tokenParser.InputText = data;
 				var output = tokenParser.ToStringFromString();