Skip to content
Snippets Groups Projects
Commit 0a9ac985 authored by srosse's avatar srosse
Browse files

Merge branch 'cluster_config_getter' of git://github.com/tomgross/OpenOLAT...

Merge branch 'cluster_config_getter' of git://github.com/tomgross/OpenOLAT into tomgross-cluster_config_getter
Merge getter method for cluser config
parents 1310218e 9d44ac9c
No related branches found
No related tags found
No related merge requests found
...@@ -118,7 +118,7 @@ public class ClusterAdminControllerCluster extends BasicController { ...@@ -118,7 +118,7 @@ public class ClusterAdminControllerCluster extends BasicController {
mainVc = createVelocityContainer("cluster"); mainVc = createVelocityContainer("cluster");
// information about the cluster nodes // information about the cluster nodes
mainVc.contextPut("own_nodeid", "This node is node: '"+clusBus.clusterConfig.getNodeId()+"'"); mainVc.contextPut("own_nodeid", "This node is node: '"+clusBus.getClusterConfig().getNodeId()+"'");
nodeInfoVc = createVelocityContainer("nodeinfos"); nodeInfoVc = createVelocityContainer("nodeinfos");
Formatter f = Formatter.getInstance(ureq.getLocale()); Formatter f = Formatter.getInstance(ureq.getLocale());
...@@ -196,7 +196,7 @@ public class ClusterAdminControllerCluster extends BasicController { ...@@ -196,7 +196,7 @@ public class ClusterAdminControllerCluster extends BasicController {
return o1.getNodeId().compareTo(o2.getNodeId()); return o1.getNodeId().compareTo(o2.getNodeId());
}}); }});
nodeInfoVc.contextPut("stats",li); nodeInfoVc.contextPut("stats",li);
nodeInfoVc.contextPut("thisNodeId", clusBus.clusterConfig.getNodeId()); nodeInfoVc.contextPut("thisNodeId", clusBus.getClusterConfig().getNodeId());
mainVc.contextPut("eventBusListener", clusBus.toString()); mainVc.contextPut("eventBusListener", clusBus.toString());
mainVc.contextPut("busListenerInfos", clusBus.getBusInfosAsString()); mainVc.contextPut("busListenerInfos", clusBus.getBusInfosAsString());
} }
......
...@@ -467,7 +467,11 @@ public class ClusterEventBus extends AbstractEventBus implements MessageListener ...@@ -467,7 +467,11 @@ public class ClusterEventBus extends AbstractEventBus implements MessageListener
log.warn("Exception in stop ClusteredSearchProvider, ",e); log.warn("Exception in stop ClusteredSearchProvider, ",e);
} }
} }
public ClusterConfig getClusterConfig() {
return clusterConfig;
}
/** /**
* [used by spring] * [used by spring]
*/ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment