Merge pull request #93 from Azure/develop_hans_noterminal

changes for V2.1.2

Author: hansgschossmann

README.md

@@ -140,6 +140,10 @@ The complete usage of the application can be shown using the `--help` command li
               --vc, --verboseconsole=VALUE
                                      the output of publisher is shown on the console.
                                        Default: False
+              --ns, --noshutdown=VALUE
+                                     publisher could not be stopped by pressing a key
+                                       on the console, but will run forever.
+                                       Default: False
               --ih, --iothubprotocol=VALUE
                                      the protocol to use for communication with Azure
                                        IoTHub (allowed values: Amqp, Http1, Amqp_

src/Diagnostics.cs

@@ -61,14 +61,14 @@ public static async Task ShowDiagnosticsInfoAsync(CancellationToken ct)
         {
             while (true)
             {
-                try
+                if (ct.IsCancellationRequested)
                 {
+                    return;
+                }
 
+                try
+                {
                     await Task.Delay((int)_diagnosticsInterval * 1000, ct);
-                    if (ct.IsCancellationRequested)
-                    {
-                        return;
-                    }
 
                     Trace("==========================================================================");
                     Trace($"OpcPublisher status @ {System.DateTime.UtcNow} (started @ {PublisherStartTime})");

src/IotHubMessaging.cs

@@ -313,7 +313,7 @@ private async Task MonitoredItemsProcessor(CancellationToken ct)
                             // if we are in shutdown do not wait, else wait infinite if send interval is not set
                             millisecondsTillNextSend = ct.IsCancellationRequested ? 0 : Timeout.Infinite;
                         }
-                        bool gotItem = _monitoredItemsDataQueue.TryTake(out jsonMessage, (int)millisecondsTillNextSend);
+                        bool gotItem = _monitoredItemsDataQueue.TryTake(out jsonMessage, (int)millisecondsTillNextSend, ct);
 
                         // the two commandline parameter --ms (message size) and --si (send interval) control when data is sent to IoTHub
                         // pls see detailed comments on performance and memory consumption at https://github.com/Azure/iot-edge-opc-publisher
@@ -426,7 +426,11 @@ private async Task MonitoredItemsProcessor(CancellationToken ct)
                 }
                 catch (Exception e)
                 {
-                    Trace(e, "Error while processing monitored item messages.");
+                    if (!(e is OperationCanceledException))
+                    {
+
+                        Trace(e, "Error while processing monitored item messages.");
+                    }
                 }
             }
         }

src/Program.cs

@@ -89,6 +89,8 @@ public async static Task MainAsync(string[] args)
                     { "di|diagnosticsinterval=", $"shows publisher diagnostic info at the specified interval in seconds. 0 disables diagnostic output.\nDefault: {DiagnosticsInterval}", (uint u) => DiagnosticsInterval = u },
 
                     { "vc|verboseconsole=", $"the output of publisher is shown on the console.\nDefault: {VerboseConsole}", (bool b) => VerboseConsole = b },
+
+                    { "ns|noshutdown=", $"publisher could not be stopped by pressing a key on the console, but will run forever.\nDefault: {_noShutdown}", (bool b) => _noShutdown = b },
 
                     // IoTHub specific options
                     { "ih|iothubprotocol=", $"the protocol to use for communication with Azure IoTHub (allowed values: {string.Join(", ", Enum.GetNames(IotHubProtocol.GetType()))}).\nDefault: {Enum.GetName(IotHubProtocol.GetType(), IotHubProtocol)}",
@@ -432,11 +434,29 @@ public async static Task MainAsync(string[] args)
                 // stop on user request
                 WriteLine("");
                 WriteLine("");
-                WriteLine("Publisher is running. Press ENTER to quit.");
+                if (_noShutdown)
+                {
+                    // wait forever if asked to do so
+                    WriteLine("Publisher is running infinite...");
+                    await Task.Delay(Timeout.Infinite);
+                }
+                else
+                {
+                    WriteLine("Publisher is running. Press any key to quit.");
+                    try
+                    {
+                        ReadKey(true);
+                    }
+                    catch
+                    {
+                        // wait forever if there is no console
+                        WriteLine("There is no console. Publisher is running infinite...");
+                        await Task.Delay(Timeout.Infinite);
+                    }
+                }
                 WriteLine("");
                 WriteLine("");
-                ReadLine();
-               ShutdownTokenSource.Cancel();
+                ShutdownTokenSource.Cancel();
                 WriteLine("Publisher is shutting down...");
 
                 // Wait for session connector completion
@@ -507,7 +527,11 @@ public static async Task SessionConnectorAsync(CancellationToken ct)
                 {
                     Trace(e, $"Failed to connect and monitor a disconnected server. {(e.InnerException != null ? e.InnerException.Message : "")}");
                 }
-                await Task.Delay(_publisherSessionConnectWaitSec * 1000, ct);
+                try
+                {
+                    await Task.Delay(_publisherSessionConnectWaitSec * 1000, ct);
+                }
+                catch { }
                 if (ct.IsCancellationRequested)
                 {
                     return;
@@ -645,5 +669,6 @@ private static void PrintSessionStatus(Session session, string reason)
         private static PublisherServer _publisherServer;
         private static bool _opcTraceInitialized = false;
         private static int _publisherSessionConnectWaitSec = 10;
+        private static bool _noShutdown = false;
     }
 }

src/PublisherNodeConfiguration.cs

@@ -147,31 +147,40 @@ public static async Task<bool> ReadConfigAsync()
                     Trace("Publishing node configuration file path read from environment.");
                     _publisherNodeConfigurationFilename = Environment.GetEnvironmentVariable("_GW_PNFP");
                 }
+                Trace($"The name of the configuration file for published nodes is: {_publisherNodeConfigurationFilename}");
 
-                Trace($"Attempting to load nodes file from: {_publisherNodeConfigurationFilename}");
-                _configurationFileEntries = JsonConvert.DeserializeObject<List<PublisherConfigurationFileEntry>>(File.ReadAllText(_publisherNodeConfigurationFilename));
-                Trace($"Loaded {_configurationFileEntries.Count} config file entry/entries.");
-
-                foreach (var publisherConfigFileEntry in _configurationFileEntries)
+                // if the file exists, read it, if not just continue 
+                if (File.Exists(_publisherNodeConfigurationFilename))
                 {
-                    if (publisherConfigFileEntry.NodeId == null)
+                    Trace($"Attemtping to load node configuration from: {_publisherNodeConfigurationFilename}");
+                    _configurationFileEntries = JsonConvert.DeserializeObject<List<PublisherConfigurationFileEntry>>(File.ReadAllText(_publisherNodeConfigurationFilename));
+                    Trace($"Loaded {_configurationFileEntries.Count} config file entry/entries.");
+
+                    foreach (var publisherConfigFileEntry in _configurationFileEntries)
                     {
-                        // new node configuration syntax.
-                        foreach (var opcNode in publisherConfigFileEntry.OpcNodes)
+                        if (publisherConfigFileEntry.NodeId == null)
                         {
-                            ExpandedNodeId expandedNodeId = ExpandedNodeId.Parse(opcNode.ExpandedNodeId);
-                            _nodePublishingConfiguration.Add(new NodePublishingConfiguration(expandedNodeId, publisherConfigFileEntry.EndpointUri, opcNode.OpcSamplingInterval ?? OpcSamplingInterval, opcNode.OpcPublishingInterval ?? OpcPublishingInterval));
+                            // new node configuration syntax.
+                            foreach (var opcNode in publisherConfigFileEntry.OpcNodes)
+                            {
+                                ExpandedNodeId expandedNodeId = ExpandedNodeId.Parse(opcNode.ExpandedNodeId);
+                                _nodePublishingConfiguration.Add(new NodePublishingConfiguration(expandedNodeId, publisherConfigFileEntry.EndpointUri, opcNode.OpcSamplingInterval ?? OpcSamplingInterval, opcNode.OpcPublishingInterval ?? OpcPublishingInterval));
+                            }
                         }
-                    }
-                    else
-                    {
-                        // NodeId (ns=) format node configuration syntax using default sampling and publishing interval.
-                        _nodePublishingConfiguration.Add(new NodePublishingConfiguration(publisherConfigFileEntry.NodeId, publisherConfigFileEntry.EndpointUri, OpcSamplingInterval, OpcPublishingInterval));
-                        // give user a warning that the syntax is obsolete
-                        Trace($"Please update the syntax of the configuration file and use ExpandedNodeId instead of NodeId property name for node with identifier '{publisherConfigFileEntry.NodeId.ToString()}' on EndpointUrl '{publisherConfigFileEntry.EndpointUri.AbsoluteUri}'.");
+                        else
+                        {
+                            // NodeId (ns=) format node configuration syntax using default sampling and publishing interval.
+                            _nodePublishingConfiguration.Add(new NodePublishingConfiguration(publisherConfigFileEntry.NodeId, publisherConfigFileEntry.EndpointUri, OpcSamplingInterval, OpcPublishingInterval));
+                            // give user a warning that the syntax is obsolete
+                            Trace($"Please update the syntax of the configuration file and use ExpandedNodeId instead of NodeId property name for node with identifier '{publisherConfigFileEntry.NodeId.ToString()}' on EndpointUrl '{publisherConfigFileEntry.EndpointUri.AbsoluteUri}'.");
 
+                        }
                     }
                 }
+                else
+                {
+                    Trace($"The node configuration file '{_publisherNodeConfigurationFilename}' does not exist. Starting up and wait for remote configuration requests.");
+                }
             }
             catch (Exception e)
             {