Merge pull request #114 from virajdere/patch/use-buffer-path-for-durable-relay

Improve MQTT Relay Module Buffer Path Handling

Author: PatrickRitchie

agent/Modules/MTConnect.NET-AgentModule-MqttRelay/Module.cs

@@ -38,7 +38,8 @@ public class Module : MTConnectAgentModule
         private static readonly object _lastSentSequenceLock = new object();
         private long _totalIncomingObservations = 0;
         private long _lastSentSequence = 0;
-
+        private const string DirectoryBuffer = "buffer";
+        private const string LastSentSequenceFileName = "mqttrelay_last_sent.seq";
 
         public Module(IMTConnectAgentBroker mtconnectAgent, object configuration) : base(mtconnectAgent)
         {
@@ -334,17 +335,25 @@ private async Task RelayBufferedObservations()
             }
         }
 
-        private static string GetLastSentSequenceFilePath()
+        private static string GetLastSentSequenceFilePath(IAgentApplicationConfiguration agentConfig = null)
         {
-            var bufferDir = Path.Combine(AppContext.BaseDirectory, "buffer");
-            Directory.CreateDirectory(bufferDir);
-            return Path.Combine(bufferDir, "mqttrelay_last_sent.seq");
+            string baseDir = !string.IsNullOrEmpty(agentConfig?.DurableBufferPath)
+                ? agentConfig.DurableBufferPath
+                : DirectoryBuffer;
+
+            if (!Path.IsPathRooted(baseDir))
+            {
+                baseDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, baseDir);
+            }
+            Directory.CreateDirectory(baseDir);
+            return Path.Combine(baseDir, LastSentSequenceFileName);
         }
 
         private ulong GetLastSentSequence()
         {
-            if (!_configuration.DurableRelay) return 0; // Default
-            var path = GetLastSentSequenceFilePath();
+            if (!_configuration.DurableRelay) return 0;
+            var agentConfig = Agent?.Configuration as IAgentApplicationConfiguration;
+            var path = GetLastSentSequenceFilePath(agentConfig);
             lock (_lastSentSequenceLock)
             {
                 if (File.Exists(path))
@@ -359,7 +368,8 @@ private ulong GetLastSentSequence()
         private void SetLastSentSequence(ulong seq)
         {
             if (!_configuration.DurableRelay) return; // Default
-            var path = GetLastSentSequenceFilePath();
+            var agentConfig = Agent?.Configuration as IAgentApplicationConfiguration;
+            var path = GetLastSentSequenceFilePath(agentConfig);
             lock (_lastSentSequenceLock)
             {
                 File.WriteAllText(path, seq.ToString());