Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Libraries/Opc.Ua.PubSub/IntervalRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public IntervalRunner(
public object Id { get; }

/// <summary>
/// Get/set the Interval between Runs
/// Get/set the Interval between Runs in milliseconds
/// </summary>
public double Interval
{
Expand Down
14 changes: 12 additions & 2 deletions Libraries/Opc.Ua.PubSub/Transport/MqttPubSubConnection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,10 @@ is not BrokerDataSetWriterTransportDataType transport ||
MqttClient publisherClient = null;
MqttClient subscriberClient = null;

TimeSpan keepAlive = CalculateMqttKeepAlive();

m_publisherMqttClientOptions ??= GetMqttClientOptions();
m_publisherMqttClientOptions.KeepAlivePeriod = keepAlive;

int nrOfPublishers = Publishers.Count;
int nrOfSubscribers = GetAllDataSetReaders().Count;
Expand Down Expand Up @@ -483,6 +486,7 @@ is BrokerDataSetReaderTransportDataType brokerTransportSettings &&
}

m_subscriberMqttClientOptions ??= GetMqttClientOptions();
m_subscriberMqttClientOptions.KeepAlivePeriod = keepAlive;

subscriberClient = (MqttClient)
await MqttClientCreator
Expand Down Expand Up @@ -730,14 +734,20 @@ private static MqttQualityOfServiceLevel GetMqttQualityOfServiceLevel(
}
}

private TimeSpan CalculateMqttKeepAlive()
{
// writer group KeepAliveTime is given in milliseconds
return TimeSpan.FromMilliseconds(GetWriterGroupsMaxKeepAlive()) +
TimeSpan.FromSeconds(m_maxKeepAliveIncrement);
}

/// <summary>
/// Get appropriate IMqttClientOptions with which to connect to the MQTTBroker
/// </summary>
private MqttClientOptions GetMqttClientOptions()
{
MqttClientOptions mqttOptions = null;
var mqttKeepAlive = TimeSpan.FromSeconds(
GetWriterGroupsMaxKeepAlive() + m_maxKeepAliveIncrement);
TimeSpan mqttKeepAlive = CalculateMqttKeepAlive();

if (ExtensionObject.ToEncodeable(PubSubConnectionConfiguration.Address)
is not NetworkAddressUrlDataType networkAddressUrlState)
Expand Down
Loading