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

Fix CronJob distribution #875

Merged
merged 1 commit into from
Apr 26, 2024
Merged

Fix CronJob distribution #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion udmis/src/main/java/com/google/bos/udmi/service/core/CronProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ public class CronProcessor extends ProcessorBase {

private static final String PAYLOAD_SEPARATOR = ":";
private static final String PATH_SEPARATOR = "/";
private static final String ID_SEPARATOR = "~";
private static final long CUTOFF_INTERVALS = 3;
private static final DefaultMustacheFactory MUSTACHE_FACTORY = new DefaultMustacheFactory();
private static final SortedMap<String, Instant> TRACKER = new ConcurrentSkipListMap<>();
private static final String HEARTBEAT_NAME = "heartbeat";
private static final String HEARTBEAT_SUFFIX = PATH_SEPARATOR + HEARTBEAT_NAME;
private static final String HEARTBEAT_SUFFIX = ID_SEPARATOR + HEARTBEAT_NAME;
private static Integer HEARTBEAT_SEC;
private final Envelope srcEnvelope;
private final Mustache template;
Expand Down
6 changes: 6 additions & 0 deletions udmis/src/main/java/com/google/bos/udmi/service/core/DistributorPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,10 @@ public void publish(Envelope rawEnvelope, Object message, String source) {
public String getRouteId(String source) {
return format("%s%s%s", clientId, ROUTE_SEPARATOR, source);
}

@Override
public void activate() {
super.activate();
info("Distributing as client " + clientId);
}
}
4 changes: 4 additions & 0 deletions udmis/src/main/java/com/google/bos/udmi/service/messaging/impl/SimpleMqttPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.udmi.util.Common.PUBLISH_TIME_KEY;
import static com.google.udmi.util.GeneralUtils.friendlyStackTrace;
import static com.google.udmi.util.GeneralUtils.ifNotNullThen;
import static com.google.udmi.util.GeneralUtils.ifTrueThen;
import static com.google.udmi.util.GeneralUtils.nullAsNull;
import static com.google.udmi.util.JsonUtil.getNowInstant;
import static com.google.udmi.util.JsonUtil.isoConvert;
import static com.google.udmi.util.JsonUtil.toStringMap;
import static java.lang.String.format;
import static java.util.Optional.ofNullable;
Expand Down Expand Up @@ -240,6 +243,7 @@ public void deliveryComplete(IMqttDeliveryToken token) {
public void messageArrived(String topic, MqttMessage message) {
try {
Map<String, String> envelopeMap = parseEnvelopeTopic(topic);
envelopeMap.put(PUBLISH_TIME_KEY, isoConvert());
receiveMessage(envelopeMap, new String(message.getPayload()));
} catch (Exception e) {
error("Exception receiving message on %s: %s", clientId, friendlyStackTrace(e));
Expand Down
Loading