Author: tdraier
Date: Tue Aug 28 17:38:08 2007
New Revision: 18282
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18282&repname=
=3Djahia
Log:
-do not try to send creation events when importing
-flush aggregated events regularly to avoid oom
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/events/Ja=
hiaEventGeneratorBaseService.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreationDateListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreatorListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/settings/SettingsB=
ean.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/eve=
nts/JahiaEventGeneratorBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/events/JahiaEventGeneratorBaseServ=
ice.java&rev=3D18282&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/events/Ja=
hiaEventGeneratorBaseService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/events/Ja=
hiaEventGeneratorBaseService.java Tue Aug 28 17:38:08 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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentCreationDateListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentCre=
ationDateListener.java&rev=3D18282&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreationDateListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreationDateListener.java Tue Aug 28 17:38:08 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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentCreatorListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentCre=
atorListener.java&rev=3D18282&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreatorListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreatorListener.java Tue Aug 28 17:38:08 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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/settings/Set=
tingsBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/settings/SettingsBean.java&rev=3D18282&repn=
ame=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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/settings/SettingsB=
ean.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/settings/SettingsB=
ean.java Tue Aug 28 17:38:08 2007
@@ -331,6 +331,8 @@
=
private int cacheMaxGroups =3D 10000;
=
+ private int maxAggregatedEvents =3D 1000;
+
private boolean showGEDProperties;
private boolean useFlatFileManager;
private boolean showTimeBasedPublishingIcons;
@@ -748,6 +750,8 @@
clusterCacheMaxBatchSize =3D getInt("clusterCacheMaxBatchSize"=
, 100000);
cacheMaxGroups =3D getInt("cacheMaxGroups", 10000);
=
+ maxAggregatedEvents =3D getInt("maxAggregatedEvents", 1000);
+
useFlatFileManager =3D getBoolean("useFlatFileManager", true);
showGEDProperties =3D getBoolean("showGEDProperties", false);
waiAutoAddMissingAttributes =3D getBoolean("waiAutoAddMissingA=
ttributes", true);
@@ -2058,7 +2062,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
