mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-22 22:45:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Metrics can be renamed

Browse source
This commit is contained in:
Florian Reimair 2018-12-11 11:19:25 +01:00
parent a73c24fa1b
commit 930cb8c56a
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
monitor/src/main/java/bisq/monitor/metric/Metric.java
View file

@ -56,7 +56,7 @@ public abstract class Metric extends Thread {
final Properties myProperties = new Properties();
properties.forEach((k, v) -> {
String key = (String) k;
if (key.startsWith(this.getClass().getSimpleName()))
if (key.startsWith(getName()))
myProperties.put(key.substring(key.indexOf(".") + 1), v);
});

15
monitor/src/test/java/bisq/monitor/MonitorInfrastructureTests.java
View file

@ -91,12 +91,22 @@ public class MonitorInfrastructureTests {
// our dummy
Dummy DUT = new Dummy();
// a second dummy to run as well
Dummy DUT2 = new Dummy();
DUT2.setName("Dummy2");
Properties dummy2Properties = new Properties();
dummy2Properties.put("Dummy2.enabled", "true");
dummy2Properties.put("Dummy2.run.interval", "1");
DUT2.configure(dummy2Properties);
DUT2.start();
// disable
DUT.configure(new Properties());
DUT.start();
// wait for the thread to be started
Thread.sleep(100);
Assert.assertEquals(Thread.State.WAITING, DUT.getState());
Assert.assertEquals(Thread.State.TIMED_WAITING, DUT2.getState());
// enable
Properties properties = new Properties();
@ -106,20 +116,25 @@ public class MonitorInfrastructureTests {
// wait for things to be done
Thread.sleep(100);
Assert.assertEquals(Thread.State.TIMED_WAITING, DUT.getState());
Assert.assertEquals(Thread.State.TIMED_WAITING, DUT2.getState());
// disable again
DUT.configure(new Properties());
Thread.sleep(100);
Assert.assertEquals(Thread.State.WAITING, DUT.getState());
Assert.assertEquals(Thread.State.TIMED_WAITING, DUT2.getState());
// enable again
DUT.configure(properties);
// wait for things to be done
Thread.sleep(100);
Assert.assertEquals(Thread.State.TIMED_WAITING, DUT.getState());
Assert.assertEquals(Thread.State.TIMED_WAITING, DUT2.getState());
// graceful shutdown
DUT.shutdown();
DUT.join();
DUT2.shutdown();
DUT2.join();
}
}