Skip to content

Commit 59ac372

Browse files
committed
Improve logging of Redis implementations
1 parent 1d34547 commit 59ac372

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

src/main/java/eu/openanalytics/containerproxy/model/store/redis/RedisProxyStore.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,21 @@ public List<Proxy> getAllProxies() {
7070

7171
@Override
7272
public void addProxy(Proxy proxy) {
73-
logger.info("Add proxy {}", proxy.getId());
73+
logger.debug("Add proxy {}", proxy.getId());
7474
ops.put(redisKey, proxy.getId(), proxy);
7575
updateMappings(proxy);
7676
}
7777

7878
@Override
7979
public void removeProxy(Proxy proxy) {
80-
logger.info("Remove proxy {}", proxy.getId());
80+
logger.debug("Remove proxy {}", proxy.getId());
8181
ops.delete(redisKey, proxy.getId());
8282
updateMappings(proxy);
8383
}
8484

8585
@Override
8686
public void updateProxy(Proxy proxy) {
87-
logger.info("Update proxy {}", proxy.getId());
87+
logger.debug("Update proxy {}", proxy.getId());
8888
ops.put(redisKey, proxy.getId(), proxy);
8989
updateMappings(proxy);
9090
}
@@ -104,7 +104,7 @@ public void updateMappings(Proxy proxy) {
104104
Map<String, URI> oldTargets = targetsCache.remove(proxy.getId());
105105
if (oldTargets != null) {
106106
// there were still some old mappings -> remove them
107-
logger.info("Redis: remove mappings for {}", proxy.getId());
107+
logger.debug("Redis: remove mappings for {}", proxy.getId());
108108
for (Map.Entry<String, URI> target : proxy.getTargets().entrySet()) {
109109
mappingManager.removeMapping(target.getKey());
110110
}

src/main/java/eu/openanalytics/containerproxy/service/leader/redis/RedisLeaderService.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
package eu.openanalytics.containerproxy.service.leader.redis;
2222

2323

24+
import eu.openanalytics.containerproxy.service.IdentifierService;
2425
import eu.openanalytics.containerproxy.service.leader.ILeaderService;
2526
import org.apache.logging.log4j.LogManager;
2627
import org.apache.logging.log4j.Logger;
@@ -41,6 +42,9 @@ public class RedisLeaderService implements Candidate, ILeaderService {
4142
@Inject
4243
private ExpirableLockRegistry lockRegistry;
4344

45+
@Inject
46+
private IdentifierService identifierService;
47+
4448
private volatile boolean isLeader;
4549

4650
private final Logger logger = LogManager.getLogger(getClass());
@@ -65,13 +69,13 @@ public String getId() {
6569
@Override
6670
public void onGranted(@Nonnull Context context) {
6771
isLeader = true;
68-
logger.info("This server is now the leader.");
72+
logger.info("This server (runtimeId: {}) is now the leader.", identifierService.runtimeId);
6973
}
7074

7175
@Override
7276
public void onRevoked(@Nonnull Context context) {
7377
isLeader = false;
74-
logger.info("This server is no longer the leader.");
78+
logger.info("This server (runtimeId: {}) is no longer the leader.", identifierService.runtimeId);
7579
}
7680

7781
@Override

0 commit comments

Comments
 (0)