inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build - solr ping uses cron expression

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29305 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2011-07-25 13:10:45 +00:00
parent d3d0a33fe9
commit c4d2cefaeb
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/core-services-context.xml
View File

@@ -1017,7 +1017,7 @@
<property name="solrUrl" value="${solr.solrUrl}"/> <property name="solrUrl" value="${solr.solrUrl}"/>
<property name="solrUser" value="${solr.solrUser}"/> <property name="solrUser" value="${solr.solrUser}"/>
<property name="solrPassword" value="${solr.solrPassword}"/> <property name="solrPassword" value="${solr.solrPassword}"/>
<property name="solrPingTime" value="${solr.pingTime}"/> <property name="solrPingCronExpression" value="${solr.solrPingCronExpression}"/>
</bean> </bean>
<bean id="solr" class="org.alfresco.repo.management.subsystems.ChildApplicationContextFactory" parent="abstractPropertyBackedBean"> <bean id="solr" class="org.alfresco.repo.management.subsystems.ChildApplicationContextFactory" parent="abstractPropertyBackedBean">

2
config/alfresco/repository.properties
View File

@@ -679,6 +679,8 @@ solr.solrUser=solr
solr.solrPassword=solr solr.solrPassword=solr
solr.secureComms.enabled=true solr.secureComms.enabled=true
solr.solrPingCronExpression=0 0/5 * * * ? *
# #
# Web Publishing Properties # Web Publishing Properties
# #

16
source/java/org/alfresco/repo/solr/SOLRAdminClient.java
View File

@@ -61,7 +61,7 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
private String solrUrl; private String solrUrl;
private String solrUser; private String solrUser;
private String solrPassword; private String solrPassword;
private int solrPingTime; // s private String solrPingCronExpression; // s
private CommonsHttpSolrServer server; private CommonsHttpSolrServer server;
private ApplicationEventPublisher applicationEventPublisher; private ApplicationEventPublisher applicationEventPublisher;
@@ -101,13 +101,13 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
{ {
this.applicationEventPublisher = applicationEventPublisher; this.applicationEventPublisher = applicationEventPublisher;
} }
public void setSolrPingTime(int solrPingTime)
{
this.solrPingTime = solrPingTime;
}
public void init() public void setSolrPingCronExpression(String solrPingCronExpression)
{
this.solrPingCronExpression = solrPingCronExpression;
}
public void init()
{ {
try try
{ {
@@ -315,7 +315,7 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
jobDataMap.put("SOLR_TRACKER", this); jobDataMap.put("SOLR_TRACKER", this);
job.setJobDataMap(jobDataMap); job.setJobDataMap(jobDataMap);
trigger = new CronTrigger("SolrWatcherTrigger", "Solr", "0/" + solrPingTime + " * * * * ? *"); trigger = new CronTrigger("SolrWatcherTrigger", "Solr", solrPingCronExpression);
scheduler.scheduleJob(job, trigger); scheduler.scheduleJob(job, trigger);
//stopTimer(); //stopTimer();
} }