From 86bea9e0016b2890db8ba83049dd4e89653a0a5e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 16 Mar 2012 17:29:39 -0400
Subject: [PATCH] Ensure that the welcome message is interpreted as UTF-8 (issue 74)
---
src/com/gitblit/GitBlit.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 580bf62..272630c 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -73,6 +73,7 @@
import com.gitblit.models.FederationSet;
import com.gitblit.models.Metric;
import com.gitblit.models.RepositoryModel;
+import com.gitblit.models.SearchResult;
import com.gitblit.models.ServerSettings;
import com.gitblit.models.ServerStatus;
import com.gitblit.models.SettingModel;
@@ -86,6 +87,7 @@
import com.gitblit.utils.MetricUtils;
import com.gitblit.utils.ObjectCache;
import com.gitblit.utils.StringUtils;
+import com.gitblit.utils.TimeUtils;
/**
* GitBlit is the servlet context listener singleton that acts as the core for
@@ -184,6 +186,7 @@
}
return self().timezone;
}
+
/**
* Returns the boolean value for the specified key. If the key does not
@@ -809,6 +812,8 @@
"gitblit", null, "postReceiveScript")));
model.mailingLists = new ArrayList<String>(Arrays.asList(config.getStringList(
"gitblit", null, "mailingList")));
+ model.indexedBranches = new ArrayList<String>(Arrays.asList(config.getStringList(
+ "gitblit", null, "indexBranch")));
}
model.HEAD = JGitUtils.getHEADRef(r);
model.availableRefs = JGitUtils.getAvailableHeadTargets(r);
@@ -868,6 +873,9 @@
repository.close();
}
}
+
+ // close any open index writer/searcher in the Lucene executor
+ luceneExecutor.close(repositoryName);
}
/**
@@ -949,6 +957,12 @@
// create repository
logger.info("create repository " + repository.name);
r = JGitUtils.createRepository(repositoriesFolder, repository.name);
+
+ // automatically index master branch if Lucene integration is enabled
+ if (luceneExecutor.isReady()) {
+ repository.indexedBranches = new ArrayList<String>();
+ repository.indexedBranches.add("refs/heads/master");
+ }
} else {
// rename repository
if (!repositoryName.equalsIgnoreCase(repository.name)) {
@@ -1056,6 +1070,9 @@
}
if (!ArrayUtils.isEmpty(repository.mailingLists)) {
config.setStringList("gitblit", null, "mailingList", repository.mailingLists);
+ }
+ if (!ArrayUtils.isEmpty(repository.indexedBranches)) {
+ config.setStringList("gitblit", null, "indexBranch", repository.indexedBranches);
}
try {
config.save();
@@ -1645,6 +1662,19 @@
}
return scripts;
}
+
+ /**
+ * Search the specified repositories using the Lucene query.
+ *
+ * @param query
+ * @param maximumHits
+ * @param repositories
+ * @return
+ */
+ public List<SearchResult> search(String query, int maximumHits, List<String> repositories) {
+ List<SearchResult> srs = luceneExecutor.search(query, maximumHits, repositories);
+ return srs;
+ }
/**
* Notify the administrators by email.
@@ -1813,12 +1843,18 @@
} else {
logger.warn("Mail server is not properly configured. Mail services disabled.");
}
- luceneExecutor = new LuceneExecutor(settings);
+ luceneExecutor = new LuceneExecutor(settings, repositoriesFolder);
if (luceneExecutor.isReady()) {
- logger.info("Lucene executor is scheduled to process the repository queue every 10 minutes.");
- scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, 10, TimeUnit.MINUTES);
+ String idle = settings.getString(Keys.lucene.frequency, "2 mins");
+ int mins = TimeUtils.convertFrequencyToMinutes(idle);
+ if (mins <= 2) {
+ mins = 2;
+ idle = mins + " mins";
+ }
+ logger.info("Lucene executor is scheduled to process ref changes every " + idle);
+ scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, mins, TimeUnit.MINUTES);
} else {
- logger.warn("Lucene executor is disabled.");
+ logger.warn("Lucene integration is disabled.");
}
if (startFederation) {
configureFederation();
@@ -1892,5 +1928,6 @@
public void contextDestroyed(ServletContextEvent contextEvent) {
logger.info("Gitblit context destroyed by servlet container.");
scheduledExecutor.shutdownNow();
+ luceneExecutor.close();
}
}
--
Gitblit v1.9.1