Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest changes to r1 #49

Merged
merged 10 commits into from
Dec 4, 2024
Merged

Merge latest changes to r1 #49

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f884122
Debugging message (#32)
atsag Nov 20, 2024
4f09320
Logging improvements (#33)
atsag Nov 21, 2024
d1de533
Sal response parsing improvement (#34)
atsag Nov 21, 2024
77625ca
Avoid publish connector stop (#36)
atsag Nov 21, 2024
1a02765
Miscellaneous improvements (#37)
atsag Nov 22, 2024
d79877b
Fix for missing device info. Also additional log messages (#38)
ipatini Nov 22, 2024
3b8920e
RD: Removed unneeded log messages (#40)
ipatini Nov 22, 2024
d8f0e08
RD: Change to reduced log messages of BrokerUtil (#42)
ipatini Nov 22, 2024
b3eec9e
Uninitialized connector fix (#43)
atsag Nov 22, 2024
b868e10
Merge remote-tracking branch 'origin/main' into r1
atsag Dec 4, 2024
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
13 changes: 10 additions & 3 deletions resource-discovery/src/main/java/eu/nebulous/resource/discovery/common/BrokerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,16 @@ public void onMessage(Message message) {
Object obj = objectMapper.readerFor(typeRef).readValue(payload);

if (obj instanceof Map<?,?> dataMap) {
log.warn("BrokerUtil: Received a new message: topic: {}", ((ActiveMQTextMessage) message).getDestination().getPhysicalName());
log.warn("BrokerUtil: Received a new message: payload: {}", dataMap);
handlePayload(((ActiveMQTextMessage) message).getDestination().getPhysicalName(), dataMap);
String topic = ((ActiveMQTextMessage) message).getDestination().getPhysicalName();
// Print response messages except the EMS node status reports (_ui_instance_info, _client_metrics)
if (StringUtils.isNotBlank(topic)
&& ! topic.equals(properties.getDeviceStatusMonitorTopic())
&& ! topic.equals(properties.getDeviceMetricsMonitorTopic()))
{
log.warn("BrokerUtil: Received a new message: topic: {}", topic);
log.warn("BrokerUtil: Received a new message: payload: {}", dataMap);
}
handlePayload(topic, dataMap);
} else {
log.warn("BrokerUtil: Message payload is not recognized. Expected Map but got: type={}, object={}", obj.getClass().getName(), obj);
}
Expand Down