Skip to content
Snippets Groups Projects
Commit 9e8daf06 authored by srosse's avatar srosse
Browse files

OO-1494: only save and fire the event for scheduler settings once, remove some print out

parent 1be5affb
No related branches found
No related tags found
No related merge requests found
...@@ -207,6 +207,7 @@ public class ClusterEventBus extends AbstractEventBus implements MessageListener ...@@ -207,6 +207,7 @@ public class ClusterEventBus extends AbstractEventBus implements MessageListener
/** /**
* this implementation must sum up all counts from all cluster nodes to return the correct number. * this implementation must sum up all counts from all cluster nodes to return the correct number.
*/ */
@Override
public int getListeningIdentityCntFor(OLATResourceable ores) { public int getListeningIdentityCntFor(OLATResourceable ores) {
return busInfos.getListenerCountFor(ores); return busInfos.getListenerCountFor(ores);
} }
...@@ -216,18 +217,15 @@ public class ClusterEventBus extends AbstractEventBus implements MessageListener ...@@ -216,18 +217,15 @@ public class ClusterEventBus extends AbstractEventBus implements MessageListener
* @see org.olat.core.util.event.AbstractOLATSystemBus#fireEventToListenersOf(org.olat.core.util.event.MultiUserEvent, * @see org.olat.core.util.event.AbstractOLATSystemBus#fireEventToListenersOf(org.olat.core.util.event.MultiUserEvent,
* org.olat.core.id.OLATResourceable) * org.olat.core.id.OLATResourceable)
*/ */
@Override
public void fireEventToListenersOf(final MultiUserEvent event, final OLATResourceable ores) { public void fireEventToListenersOf(final MultiUserEvent event, final OLATResourceable ores) {
// send the event wrapped over jms to all nodes // send the event wrapped over jms to all nodes
// (the receiver will detect whether messages are from itself and thus can be ignored, since they were already sent directly. // (the receiver will detect whether messages are from itself and thus can be ignored, since they were already sent directly.
final long msgId = ++latestSentMsgId; final long msgId = ++latestSentMsgId;
final Integer nodeId = clusterConfig.getNodeId(); final Integer nodeId = clusterConfig.getNodeId();
if(ores != null && ores.getResourceableId() != null
&& ores.getResourceableId().equals(0l) && "BusinessGroup".equals(ores.getResourceableTypeName())) {
System.out.println();
}
jmsExecutor.execute(new Runnable() { jmsExecutor.execute(new Runnable() {
@Override
public void run() { public void run() {
try { try {
ObjectMessage message = sessionProducer.createObjectMessage(); ObjectMessage message = sessionProducer.createObjectMessage();
...@@ -260,20 +258,8 @@ public class ClusterEventBus extends AbstractEventBus implements MessageListener ...@@ -260,20 +258,8 @@ public class ClusterEventBus extends AbstractEventBus implements MessageListener
* called by springs org.springframework.jms.listener.DefaultMessageListenerContainer, see coredefaultconfig.xml * called by springs org.springframework.jms.listener.DefaultMessageListenerContainer, see coredefaultconfig.xml
* we receive a message here on the topic reserved for olat system bus messages. * we receive a message here on the topic reserved for olat system bus messages.
*/ */
@Override
public void onMessage(Message message) { public void onMessage(Message message) {
/*synchronized(incomingMessagesQueue_) {
while(incomingMessagesQueue_.size()>LIMIT_ON_INCOMING_MESSAGE_QUEUE) {
try {
incomingMessagesQueue_.wait();
} catch (InterruptedException e) {
// this empty catch is okay
}
}
incomingMessagesQueue_.addFirst(message);
incomingMessagesQueue_.addFirst(System.currentTimeMillis());
incomingMessagesQueue_.notifyAll();
}*/
try{ try{
serveMessage(message, -1); serveMessage(message, -1);
} catch(RuntimeException re) { } catch(RuntimeException re) {
...@@ -325,13 +311,6 @@ public class ClusterEventBus extends AbstractEventBus implements MessageListener ...@@ -325,13 +311,6 @@ public class ClusterEventBus extends AbstractEventBus implements MessageListener
OLATResourceable ores = jmsWrapper.getOres(); OLATResourceable ores = jmsWrapper.getOres();
boolean fromSameNode = clusterConfig.getNodeId().equals(nodeId); boolean fromSameNode = clusterConfig.getNodeId().equals(nodeId);
//TODO jms update nodeinfo statistics, this doesn't work because we remove
//all the synchronization in the event bus
/* NodeInfo nodeInfo = getNodeInfoFor(nodeId);
if (log.isDebug() && !nodeInfo.update(jmsWrapper)) {
log.debug("onMessage: update failed. clustereventbus: "+this);
}*/
String recMsg = "received msg: "+(fromSameNode? "[same node]":"")+" from node:" + String recMsg = "received msg: "+(fromSameNode? "[same node]":"")+" from node:" +
nodeId + ", olat-id:" + jmsWrapper.getMsgId() + ", ores:" + ores.getResourceableTypeName() + ":" + ores.getResourceableId() + nodeId + ", olat-id:" + jmsWrapper.getMsgId() + ", ores:" + ores.getResourceableTypeName() + ":" + ores.getResourceableId() +
", event:"+event+"}"; ", event:"+event+"}";
......
...@@ -236,7 +236,8 @@ public class ReminderModule extends AbstractSpringModule { ...@@ -236,7 +236,8 @@ public class ReminderModule extends AbstractSpringModule {
public void setScheduler(String interval, String defaultSendTime) { public void setScheduler(String interval, String defaultSendTime) {
this.interval = interval; this.interval = interval;
this.defaultSendTime = defaultSendTime; this.defaultSendTime = defaultSendTime;
setStringProperty(INTERVAL, interval, true); setStringProperty(INTERVAL, interval, false);
setStringProperty(SEND_TIME, defaultSendTime, true); setStringProperty(SEND_TIME, defaultSendTime, false);
savePropertiesAndFireChangedEvent();
} }
} }
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