nheron/kie-platform
nheron/kie-platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #26 from pymma/nicoBranch

Browse source 
Adding PYMMA_OPTS environnement variable => Add JAVA OPTS to drools r…
This commit is contained in:
Nicolas Héron 2019-04-04 16:47:54 +02:00 • committed by GitHub
commit f6824148c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
docker-compose.yaml
View file

@ -46,6 +46,8 @@ services:
runtime-proxy-1:
image: runtime-proxy
container_name: "runtime-proxy-1"
environment:
PYMMA_OPTS: "-Dorg.kie.server.id=server1"
networks:
drools-network-dev:
ipv4_address: 172.27.1.22
@ -63,6 +65,8 @@ services:
runtime-proxy-2:
image: runtime-proxy
container_name: "runtime-proxy-2"
environment:
PYMMA_OPTS: "-Dorg.kie.server.id=server2"
networks:
drools-network-dev:
ipv4_address: 172.27.1.32
@ -80,6 +84,8 @@ services:
runtime-proxy-3:
image: runtime-proxy
container_name: "runtime-proxy-3"
environment:
PYMMA_OPTS: "-Dorg.kie.server.id=server3"
networks:
drools-network-dev:
ipv4_address: 172.27.1.42
@ -97,6 +103,8 @@ services:
runtime-proxy-4:
image: runtime-proxy
container_name: "runtime-proxy-4"
environment:
PYMMA_OPTS: "-Dorg.kie.server.id=server4"
networks:
drools-network-dev:
ipv4_address: 172.27.1.52
@ -114,6 +122,8 @@ services:
runtime-proxy-5:
image: runtime-proxy
container_name: "runtime-proxy-5"
environment:
PYMMA_OPTS: "-Dorg.kie.server.id=server5"
networks:
drools-network-dev:
ipv4_address: 172.27.1.62

2
drools-framework-business-proxy-parent/drools-framework-business-proxy-app/src/main/docker/Dockerfile
View file

@ -14,4 +14,4 @@ RUN mkdir /niodir-kieserver
RUN bash -c 'touch /app.jar'
ENV JAVA_OPTS "-Dspring.config.location=file:./ -DM2_HOME=/m2_kieserver -Dorg.chtijbug.server.tracedir=/trace -Dorg.appformer.m2repo.url=http://kie-wb:8080/kie-wb/maven2 -Dorg.uberfire.nio.git.dir=/niodir-kieserver -Dkie.maven.settings.custom=/m2_kieserver/settings.xml -Dorg.kie.server.repo=/niodir-kieserver -Dfile.encoding=UTF-8 -Duser.language=fr -Duser.country=FR -Dorg.chtijbug.server.sftpPort=9080"
ENTRYPOINT exec java $JAVA_OPTS -jar /app.jar
ENTRYPOINT exec java $JAVA_OPTS $PYMMA_OPTS -jar /app.jar

28
drools-framework-business-proxy-parent/drools-framework-business-proxy-app/src/main/java/org/chtijbug/drools/proxy/service/KieServiceCommon.java
View file

@ -71,34 +71,28 @@ public class KieServiceCommon {
public KieServiceCommon() {
// for now, if no server impl is passed as parameter, create one
System.out.println("step01");
this.server = KieServerLocator.getInstance();
System.out.println("step02");
List<KieServerExtension> serverExtensions = this.server.getServerExtensions();
System.out.println("step03");
for (KieServerExtension serverExtension : serverExtensions) {
if (serverExtension instanceof DroolsChtijbugKieServerExtension) {
droolsChtijbugKieServerExtension = (DroolsChtijbugKieServerExtension) serverExtension;
System.out.println("step03a");
if (droolsChtijbugRulesExecutionService == null) {
droolsChtijbugRulesExecutionService = droolsChtijbugKieServerExtension.getRulesExecutionService();
System.out.println("step03b");
}
if (registry == null) {
registry = droolsChtijbugRulesExecutionService.getContext();
System.out.println("step03c");
}
}
}
System.out.println("step04");
this.marshallerHelper = new MarshallerHelper(this.server.getServerRegistry());
System.out.println("step05");
}
public static String getKieServerID(){
return System.getProperty("org.kie.server.id");
}
@PostConstruct
private void initCamelBusinessRoutes() {
String serverName = KieServiceCommon.getKieServerID();
@ -114,11 +108,25 @@ public class KieServiceCommon {
} catch (UnknownHostException e) {
logger.info("initCamelBusinessRoutes.getLocalHost", e);
}
RuntimePersist runtimePersist = new RuntimePersist(serverName, version, "http://" + hostName + ":" + serverPort, String.valueOf(serverPort), sftpPort,hostName,RuntimePersist.STATUS.UP.toString());
RuntimePersist runtimePersist = new RuntimePersist(serverName, version, "http://" + hostName + ":" + serverPort,
String.valueOf(serverPort), sftpPort,
hostName,RuntimePersist.STATUS.UP.toString());
runtimeRepository.save(runtimePersist);
}else{
RuntimePersist runtimePersist =itIsMes.get(0);
runtimePersist.setStatus(RuntimePersist.STATUS.UP.toString());
try {
/**
* HostName may have changed by reboot so retake it and save it
*/
InetAddress inetAddress = InetAddress.getLocalHost();
String hostName = inetAddress.getHostName();
runtimePersist.setHostname("http://" + hostName + ":" + serverPort);
runtimePersist.setSftpHost(hostName);
runtimePersist.setSftpPort(sftpPort);
} catch (UnknownHostException e) {
logger.info("initCamelBusinessRoutes.getLocalHost", e);
}
runtimeRepository.save(runtimePersist);
}
try {