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

Make reverse proxy displaying more logs

Browse source
This commit is contained in:
Nicolas Héron 2019-03-08 20:43:23 +01:00
commit ca589883d5
3 changed files with 47 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

48
docker-compose.yaml
View file

@ -2,10 +2,10 @@ version: "3"
networks:
drools-network:
drools-network-dev:
ipam:
config:
- subnet: 172.27.0.0/24
- subnet: 172.27.1.0/24
services:
@ -17,8 +17,8 @@ services:
- gitdata:/home/niodir
- lucenedata:/home/lucene
networks:
drools-network:
ipv4_address: 172.27.0.5
drools-network-dev:
ipv4_address: 172.27.1.5
ports:
- 8080:8080
- 8001:8001
@ -30,8 +30,8 @@ services:
image: runtime-admin-console
container_name: "admin-console"
networks:
drools-network:
ipv4_address: 172.27.0.6
drools-network-dev:
ipv4_address: 172.27.1.6
ports:
- 8200:8200
links:
@ -48,8 +48,8 @@ services:
image: runtime-proxy
container_name: "runtime-proxy-1"
networks:
drools-network:
ipv4_address: 172.27.0.22
drools-network-dev:
ipv4_address: 172.27.1.22
ports:
- 8090
- 9080
@ -65,8 +65,8 @@ services:
image: runtime-proxy
container_name: "runtime-proxy-2"
networks:
drools-network:
ipv4_address: 172.27.0.32
drools-network-dev:
ipv4_address: 172.27.1.32
ports:
- 8090
- 9080
@ -82,8 +82,8 @@ services:
image: runtime-proxy
container_name: "runtime-proxy-3"
networks:
drools-network:
ipv4_address: 172.27.0.42
drools-network-dev:
ipv4_address: 172.27.1.42
ports:
- 8090
- 9080
@ -99,8 +99,8 @@ services:
image: runtime-proxy
container_name: "runtime-proxy-4"
networks:
drools-network:
ipv4_address: 172.27.0.52
drools-network-dev:
ipv4_address: 172.27.1.52
ports:
- 8090
- 9080
@ -116,8 +116,8 @@ services:
image: runtime-proxy
container_name: "runtime-proxy-5"
networks:
drools-network:
ipv4_address: 172.27.0.62
drools-network-dev:
ipv4_address: 172.27.1.62
ports:
- 8090
- 9080
@ -134,8 +134,8 @@ services:
image: runtime-indexer
container_name: "runtime-indexer"
networks:
drools-network:
ipv4_address: 172.27.0.23
drools-network-dev:
ipv4_address: 172.27.1.23
links:
- businessProxyDB:mongodb
- elasticsearchhost
@ -148,8 +148,8 @@ services:
image: runtime-reverse-proxy
container_name: "runtime-reverse-proxy"
networks:
drools-network:
ipv4_address: 172.27.0.25
drools-network-dev:
ipv4_address: 172.27.1.25
links:
- businessProxyDB:mongodb
@ -174,8 +174,8 @@ services:
volumes:
- esdata2:/usr/share/elasticsearch/data
networks:
drools-network:
ipv4_address: 172.27.0.7
drools-network-dev:
ipv4_address: 172.27.1.7
ports:
- 9300:9300
restart: always
@ -187,8 +187,8 @@ services:
- mongodb:/data/db
- mongodb_config:/data/configdb
networks:
drools-network:
ipv4_address: 172.27.0.3
drools-network-dev:
ipv4_address: 172.27.1.3
ports:
- 28017:27017
command: mongod

203
docker-compose.yaml.copy
View file

@ -1,203 +0,0 @@
version: "3"
networks:
drools-network:
ipam:
config:
- subnet: 172.27.0.0/24
services:
kie-wb:
image: kie-wb
container_name: "businessCentral"
volumes:
- gitdata:/home/niodir
- lucenedata:/home/lucene
networks:
drools-network:
ipv4_address: 172.27.0.5
ports:
- 8080:8080
- 8001:8001
restart: always
admin-console:
image: runtime-admin-console
container_name: "admin-console"
networks:
drools-network:
ipv4_address: 172.27.0.6
ports:
- 8200:8200
links:
- businessProxyDB:mongodb
- elasticsearchhost
- kie-wb
depends_on:
- businessProxyDB
- elasticsearchhost
- kie-wb
restart: always
runtime-proxy-1:
image: runtime-proxy
container_name: "runtime-proxy-1"
networks:
drools-network:
ipv4_address: 172.27.0.22
ports:
- 8090
- 9080
links:
- businessProxyDB:mongodb
- kie-wb:kie-wb
depends_on:
- businessProxyDB
- kie-wb
restart: always
runtime-proxy-2:
image: runtime-proxy
container_name: "runtime-proxy-2"
networks:
drools-network:
ipv4_address: 172.27.0.32
ports:
- 8090
- 9080
links:
- businessProxyDB:mongodb
- kie-wb:kie-wb
depends_on:
- businessProxyDB
- kie-wb
restart: always
runtime-proxy-3:
image: runtime-proxy
container_name: "runtime-proxy-3"
networks:
drools-network:
ipv4_address: 172.27.0.42
ports:
- 8090
- 9080
links:
- businessProxyDB:mongodb
- kie-wb:kie-wb
depends_on:
- businessProxyDB
- kie-wb
restart: always
runtime-proxy-4:
image: runtime-proxy
container_name: "runtime-proxy-4"
networks:
drools-network:
ipv4_address: 172.27.0.52
ports:
- 8090
- 9080
links:
- businessProxyDB:mongodb
- kie-wb:kie-wb
depends_on:
- businessProxyDB
- kie-wb
restart: always
runtime-proxy-5:
image: runtime-proxy
container_name: "runtime-proxy-5"
networks:
drools-network:
ipv4_address: 172.27.0.62
ports:
- 8090
- 9080
links:
- businessProxyDB:mongodb
- kie-wb:kie-wb
depends_on:
- businessProxyDB
- kie-wb
restart: always
runtime-indexer:
image: runtime-indexer
container_name: "runtime-indexer"
networks:
drools-network:
ipv4_address: 172.27.0.23
links:
- businessProxyDB:mongodb
- elasticsearchhost
depends_on:
- businessProxyDB
- elasticsearchhost
restart: always
runtime-reverse-proxy:
image: runtime-reverse-proxy
container_name: "runtime-reverse-proxy"
networks:
drools-network:
ipv4_address: 172.27.0.25
links:
- businessProxyDB:mongodb
depends_on:
- businessProxyDB
ports:
- 9500:9500
restart: always
elasticsearchhost:
image: docker.elastic.co/elasticsearch/elasticsearch:6.6.1
container_name: "elasticsearchhost"
ulimits:
memlock:
soft: -1
hard: -1
volumes:
- esdata2:/usr/share/elasticsearch/data
networks:
drools-network:
ipv4_address: 172.27.0.7
ports:
- 9300:9300
restart: always
businessProxyDB:
image: mongo
container_name: "businessProxyDB"
volumes:
- mongodb:/data/db
- mongodb_config:/data/configdb
networks:
drools-network:
ipv4_address: 172.27.0.3
ports:
- 28017:27017
command: mongod
restart: always
volumes:
mongodb:
mongodb_config:
gitdata:
lucenedata:
esdata2:

26
drools-framework-business-proxy-parent/drools-framework-business-reverse-proxy/src/main/java/org/chtijbug/drools/reverseproxy/service/UpdateService.java
View file

@ -5,6 +5,8 @@ import org.chtijbug.drools.proxy.persistence.model.ProjectPersist;
import org.chtijbug.drools.proxy.persistence.model.RuntimePersist;
import org.chtijbug.drools.proxy.persistence.repository.ProjectRepository;
import org.chtijbug.drools.proxy.persistence.repository.RuntimeRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -13,6 +15,7 @@ import java.util.*;
@Service("updateService")
public class UpdateService {
private static final Logger logger = LoggerFactory.getLogger(UpdateService.class);
@Autowired
private ProjectRepository projectRepository;
@ -93,17 +96,34 @@ public class UpdateService {
if (projectPersist.getServerNames().size() > 0) {
projects.put(projectPersist.getContainerID(), projectPersist.duplicate());
MappingProperties mappingProperties2 = new MappingProperties();
String servList=null;
for (String serverName : projectPersist.getServerNames()) {
RuntimePersist runtimePersist = runtimes.get(serverName);
String hostName = runtimePersist.getHostname() + "/api/" + projectPersist.getContainerID();
mappingProperties2.getDestinations().add(hostName);
if (runtimePersist!= null) {
String hostName = runtimePersist.getHostname() + "/api/" + projectPersist.getContainerID();
mappingProperties2.getDestinations().add(hostName);
if (servList==null){
servList=serverName;
}else{
servList=servList+":"+serverName;
}
}
}
paths.add(mappingProperties2);
mappingProperties2.setName(projectPersist.getContainerID());
mappingProperties2.setPath("/" + projectPersist.getContainerID());
mappingProperties2.getCustomConfiguration().put("connect", 2000);
mappingProperties2.getCustomConfiguration().put("read", 2000);
mappingProperties2.setStripPath(true);
if ( mappingProperties2.getDestinations().size()>0) {
paths.add(mappingProperties2);
logger.info("Project "+projectPersist.getContainerID()+" defined on servers - "+servList);
}else{
logger.error("Project "+projectPersist.getContainerID()+" defined on non existing server");
}
}
}