Skip to content

Commit 9d0ad27

Browse files
committed
Fixed zookeeper node delete with failed code generation
1 parent 88f8747 commit 9d0ad27

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/main/java/org/computate/frFR/java/EcrireToutesClasses.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ else if(BooleanUtils.isTrue(partEstEntite)) {
194194
ecrireGenApiServiceImpl1(langueNom);
195195
ecrireGenApiServiceImpl2(langueNom);
196196
ecrireGenApiServiceImpl3(langueNom);
197+
ecrireGenApiServiceImpl4(langueNom);
197198
ecrireApiServiceImpl(langueNom);
198199
}
199200
}

src/main/java/org/computate/frFR/java/RegarderRepertoire.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -592,9 +592,10 @@ private void regarderClasseEvenement(Message<Object> message) {
592592
Promise<Void> promise = Promise.promise();
593593
String zookeeperNodeName = null;
594594
Stat zookeeperStat = null;
595+
String cheminCompletStr = null;
595596
try {
596597
JsonObject body = ((JsonObject)message.body()).getJsonObject("context").getJsonObject("params").getJsonObject("body");
597-
String cheminCompletStr = body.getString("cheminComplet");
598+
cheminCompletStr = body.getString("cheminComplet");
598599
LOG.debug(String.format("Received request on the event bus: %s", cheminCompletStr));
599600
Path cheminComplet = Path.of(cheminCompletStr);
600601
zookeeperStat = new Stat();
@@ -613,14 +614,16 @@ private void regarderClasseEvenement(Message<Object> message) {
613614

614615
executeur.setWorkingDirectory(repertoireTravail);
615616
executeur.execute(ligneCommande);
616-
zookeeper.delete(zookeeperNodeName, zookeeperStat.getVersion());
617617
String classeNomSimple = StringUtils.substringBeforeLast(cheminComplet.getFileName().toString(), ".");
618618
String log = String.format(classeLangueConfig.getString(I18n.str_chemin_absolu), classeNomSimple);
619619
LOG.info(log);
620620
promise.complete();
621621
} catch(Exception ex) {
622622
if(!(ex instanceof KeeperException.NodeExistsException))
623-
LOG.error("Une Problème d'exécution de RegarderRepertoire. ", ex);
623+
LOG.error(String.format(classeLangueConfig.getString(I18n.str_UneProblemeExecutionRegarderRepertoire), cheminCompletStr), ex);
624+
promise.fail(ex);
625+
} finally {
626+
zookeeper.delete(zookeeperNodeName, zookeeperStat.getVersion());
624627
}
625628
return promise.future();
626629
});
@@ -826,7 +829,7 @@ public void start(Promise<Void> startPromise) throws Exception {
826829
connectionLatch.await();
827830
Stat zookeeperStat = new Stat();
828831
try {
829-
zookeeper.create(String.format("/%s", ZOOKEEPER_ROOT_PATH), "reserved".getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL, zookeeperStat);
832+
zookeeper.create(String.format("/%s", ZOOKEEPER_ROOT_PATH), "reserved".getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT, zookeeperStat);
830833
} catch(KeeperException.NodeExistsException ex) {
831834
LOG.info(String.format("The zookeeper root node already exists: %s", String.format("/%s", ZOOKEEPER_ROOT_PATH)));
832835
}

0 commit comments

Comments
 (0)