修改:timer api

This commit is contained in:
lxy 2021-01-12 17:29:22 +08:00
parent d70d9ad244
commit f4089d4118
2 changed files with 11 additions and 21 deletions

View File

@ -146,7 +146,7 @@ public abstract class ZHubConsumer extends AbstractConsumer implements IConsumer
// 重连 timer 订阅 // 重连 timer 订阅
timerMap.forEach((name, timer) -> { timerMap.forEach((name, timer) -> {
send("timer", name, timer.expr, timer.single ? "a" : "x"); send("timer", name);
}); });
} catch (IOException e) { } catch (IOException e) {
logger.log(Level.WARNING, "Zdb Consumer 初始化失败!", e); logger.log(Level.WARNING, "Zdb Consumer 初始化失败!", e);
@ -180,43 +180,33 @@ public abstract class ZHubConsumer extends AbstractConsumer implements IConsumer
// timer // timer
private ConcurrentHashMap<String, Timer> timerMap = new ConcurrentHashMap(); private ConcurrentHashMap<String, Timer> timerMap = new ConcurrentHashMap();
public void timer(String name, String expr, Runnable run) { public void timer(String name, Runnable run) {
timerMap.put(name, new Timer(name, expr, run, false)); timerMap.put(name, new Timer(name, run));
send("timer", name, expr, "x"); send("timer", name);
} }
public void timerSingle(String name, String expr, Runnable run) { public void reloadTimer() {
send("timer", name, expr, "a"); send("cmd", "reload-timer-config");
timerMap.put(name, new Timer(name, expr, run, true));
} }
class Timer { class Timer {
String name; String name;
String expr; //String expr;
Runnable runnable; Runnable runnable;
boolean single; //boolean single;
public String getName() { public String getName() {
return name; return name;
} }
public String getExpr() {
return expr;
}
public Runnable getRunnable() { public Runnable getRunnable() {
return runnable; return runnable;
} }
public boolean isSingle() { public Timer(String name, Runnable runnable) {
return single;
}
public Timer(String name, String expr, Runnable runnable, boolean single) {
this.name = name; this.name = name;
this.expr = expr;
this.runnable = runnable; this.runnable = runnable;
this.single = single;
} }
} }
} }

View File

@ -37,7 +37,7 @@ public class AppTest {
}) })
);*/ );*/
consumer.timerSingle("a", "*/10 * * * * *", () -> { consumer.timer("a", () -> {
System.out.println(Utility.now() + " timer a 执行了"); System.out.println(Utility.now() + " timer a 执行了");
}); });