aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar/broadcast/RedisBroadcastService.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/traccar/broadcast/RedisBroadcastService.java')
-rw-r--r--src/main/java/org/traccar/broadcast/RedisBroadcastService.java11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/main/java/org/traccar/broadcast/RedisBroadcastService.java b/src/main/java/org/traccar/broadcast/RedisBroadcastService.java
index e87ad5e61..697c45a4a 100644
--- a/src/main/java/org/traccar/broadcast/RedisBroadcastService.java
+++ b/src/main/java/org/traccar/broadcast/RedisBroadcastService.java
@@ -38,7 +38,6 @@ public class RedisBroadcastService extends BaseBroadcastService {
private final ExecutorService service = Executors.newSingleThreadExecutor();
- private final String url;
private final String channel = "traccar";
private Jedis subscriber;
@@ -48,7 +47,7 @@ public class RedisBroadcastService extends BaseBroadcastService {
public RedisBroadcastService(Config config, ObjectMapper objectMapper) throws IOException {
this.objectMapper = objectMapper;
- url = config.getString(Keys.BROADCAST_ADDRESS);
+ String url = config.getString(Keys.BROADCAST_ADDRESS);
try {
subscriber = new Jedis(url);
@@ -69,9 +68,7 @@ public class RedisBroadcastService extends BaseBroadcastService {
try {
String payload = id + ":" + objectMapper.writeValueAsString(message);
publisher.publish(channel, payload);
- } catch (IOException e) {
- LOGGER.warn("Broadcast failed", e);
- } catch (JedisConnectionException e) {
+ } catch (IOException | JedisConnectionException e) {
LOGGER.warn("Broadcast failed", e);
}
}
@@ -114,13 +111,11 @@ public class RedisBroadcastService extends BaseBroadcastService {
if (messageChannel.equals(channel) && parts.length == 2 && !id.equals(parts[0])) {
handleMessage(objectMapper.readValue(parts[1], BroadcastMessage.class));
}
- } catch (IOException e) {
+ } catch (Exception e) {
LOGGER.warn("Broadcast handleMessage failed", e);
}
}
}, channel);
- } catch (JedisConnectionException e) {
- throw new RuntimeException(e);
} catch (JedisException e) {
throw new RuntimeException(e);
}