Author: tdraier
Date: Fri Sep 14 13:06:58 2007
New Revision: 18468
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18468&repname=
=3Djahia
Log:
-do not try to send creation events when importing
-flush aggregated events regularly to avoid oom (port 18282)
Modified:
trunk/core/src/java/org/jahia/services/events/JahiaEventGeneratorBaseSe=
rvice.java
trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentC=
reationDateListener.java
trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentC=
reatorListener.java
trunk/core/src/java/org/jahia/settings/SettingsBean.java
Modified: trunk/core/src/java/org/jahia/services/events/JahiaEventGenerator=
BaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/events/JahiaEventGeneratorBaseService.java&rev=3D18468&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/events/JahiaEventGeneratorBaseSe=
rvice.java (original)
+++ trunk/core/src/java/org/jahia/services/events/JahiaEventGeneratorBaseSe=
rvice.java Fri Sep 14 13:06:58 2007
@@ -35,6 +35,7 @@
import org.jahia.data.events.JahiaEvent;
import org.jahia.exceptions.JahiaException;
import org.jahia.registries.JahiaListenersRegistry;
+import org.jahia.bin.Jahia;
import org.springframework.util.StringUtils;
=
import java.util.*;
@@ -80,10 +81,14 @@
}
MethodWithEvent methodWithEvent =3D new MethodWithEvent(method, ev=
ent);
events.add(methodWithEvent);
+
+ if (events.size() > Jahia.getSettings().getMaxAggregatedEvents()) {
+ fireAggregatedEvents();
+ }
}
=
public void fireAggregatedEvents() {
- logger.debug("Aggregated events handling ..");
+ logger.info("Flushing events ..");
=
fireAggregatedEventsFlush();
=
@@ -404,7 +409,7 @@
}
=
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
- // Nicol=C3=A1s Charczewski - Neoris Argentina - added 28/03/2006 - be=
gin
+ // Nicol=C3=AF=C2=BF=C2=BDs Charczewski - Neoris Argentina - added 28/=
03/2006 - begin
public void fireDeletePage (JahiaEvent theEvent) throws JahiaException=
{
JahiaListenersRegistry.getInstance ().wakeupListeners ("pageDelete=
d", theEvent);
}
@@ -457,7 +462,7 @@
this.aggregatedEventWeigth =3D aggregatedEventWeigth;
}
=
- // Nicol=C3=A1s Charczewski - Neoris Argentina - added 28/03/2006 - end
+ // Nicol=C3=AF=C2=BF=C2=BDs Charczewski - Neoris Argentina - added 28/=
03/2006 - end
// =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=
class MethodWithEvent {
Modified: trunk/core/src/java/org/jahia/services/metadata/core/listeners/Co=
ntentCreationDateListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/metadata/core/listeners/ContentCreationDateListener.java&=
rev=3D18468&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentC=
reationDateListener.java (original)
+++ trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentC=
reationDateListener.java Fri Sep 14 13:06:58 2007
@@ -25,6 +25,7 @@
import org.jahia.engines.metadata.Metadata_Engine;
import org.jahia.params.ProcessingContext;
import org.jahia.services.version.EntryLoadRequest;
+import org.jahia.bin.Jahia;
=
import java.util.HashMap;
=
@@ -93,7 +94,11 @@
}
=
public void contentObjectCreated(JahiaEvent theEvent){
- ProcessingContext jParams =3D theEvent.getProcessingContext();
+ if (Jahia.getThreadParamBean().getAttribute("importMode") !=3D nul=
l){
+ return;
+ }
+
+ ProcessingContext jParams =3D theEvent.getProcessingContext();
ContentObject contentObject =3D (ContentObject)theEvent.getObject(=
);
=
if ( contentObject =3D=3D null || jParams=3D=3Dnull ){
Modified: trunk/core/src/java/org/jahia/services/metadata/core/listeners/Co=
ntentCreatorListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/metadata/core/listeners/ContentCreatorListener.java&rev=
=3D18468&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentC=
reatorListener.java (original)
+++ trunk/core/src/java/org/jahia/services/metadata/core/listeners/ContentC=
reatorListener.java Fri Sep 14 13:06:58 2007
@@ -24,6 +24,7 @@
import org.jahia.data.fields.JahiaField;
import org.jahia.engines.metadata.Metadata_Engine;
import org.jahia.params.ProcessingContext;
+import org.jahia.bin.Jahia;
=
import java.util.HashMap;
=
@@ -90,6 +91,10 @@
}
=
public void contentObjectCreated(JahiaEvent theEvent){
+ if (Jahia.getThreadParamBean().getAttribute("importMode") !=3D nul=
l){
+ return;
+ }
+
ProcessingContext jParams =3D theEvent.getProcessingContext();
ContentObject contentObject =3D (ContentObject)theEvent.getObject(=
);
=
Modified: trunk/core/src/java/org/jahia/settings/SettingsBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/settings/SettingsBean.java&rev=3D18468&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/settings/SettingsBean.java (original)
+++ trunk/core/src/java/org/jahia/settings/SettingsBean.java Fri Sep 14 13:=
06:58 2007
@@ -332,6 +332,7 @@
private int cacheMaxGroups =3D 10000;
=
private boolean enableJcrSearch;
+ private int maxAggregatedEvents =3D 1000;
private boolean useFlatFileManager;
private boolean showTimeBasedPublishingIcons;
private boolean developmentMode =3D true;
@@ -762,6 +763,8 @@
clusterCacheMaxBatchSize =3D getInt("clusterCacheMaxBatchSize"=
, 100000);
cacheMaxGroups =3D getInt("cacheMaxGroups", 10000);
=
+ maxAggregatedEvents =3D getInt("maxAggregatedEvents", 1000);
+
useFlatFileManager =3D getBoolean("useFlatFileManager", true);
enableJcrSearch =3D getBoolean("enableJcrSearch", false);
waiAutoAddMissingAttributes =3D getBoolean("waiAutoAddMissingA=
ttributes", true);
@@ -2168,7 +2171,15 @@
public void setCacheMaxGroups(int cacheMaxGroups) {
this.cacheMaxGroups =3D cacheMaxGroups;
}
- =
+
+ public int getMaxAggregatedEvents() {
+ return maxAggregatedEvents;
+ }
+
+ public void setMaxAggregatedEvents(int maxAggregatedEvents) {
+ this.maxAggregatedEvents =3D maxAggregatedEvents;
+ }
+
public long getPageGenerationWaitTime() {
return pageGenerationWaitTime;
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
