summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSHaselbauer <sarah.haselbauer@akquinet.de>2013-01-23 16:27:42 +0100
committerSHaselbauer <sarah.haselbauer@akquinet.de>2013-01-23 16:27:42 +0100
commit514da0237f6239322193d5d4b11b58fe4095da2b (patch)
tree7df9ff9372ef22d92cacefe0dbb348c0c53588ec /src
parentc7acc2e1fa86102bb87e715c8fe4e336329fbcc6 (diff)
downloadgitblit-514da0237f6239322193d5d4b11b58fe4095da2b.tar.gz
gitblit-514da0237f6239322193d5d4b11b58fe4095da2b.zip
seleniumFixV2: connected thread pool creation to condition web.allowLuceneIndexing (otherwise thread pool will be kept open for more than a minute, what hinders the start of another gitblit instance in the same jvm during selenium test case execution), fixed naming of xpath variables, added missing property to gitblit.properties and test-ui-gitblit.properties, changed naming of methods (according to decision that owners is a much shorter word than repository administrator and that owners is fits better if you think of collective responsibilities and collective ownership)
Diffstat (limited to 'src')
-rw-r--r--src/com/gitblit/GitBlit.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 6bf75d75..f47e76ca 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -3096,8 +3096,14 @@ public class GitBlit implements ServletContextListener {
}
// schedule lucene engine
- logger.info("Lucene executor is scheduled to process indexed branches every 2 minutes.");
- scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, 2, TimeUnit.MINUTES);
+ boolean luceneIndexing = settings.getBoolean(Keys.web.allowLuceneIndexing, true);
+ logger.info("Lucene indexing is " + (luceneIndexing ? "" : "not") + " activated");
+
+ if (luceneIndexing) {
+ scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, 2, TimeUnit.MINUTES);
+ logger.info("Lucene executor is scheduled to process indexed branches every 2 minutes.");
+ }
+
// schedule gc engine
if (gcExecutor.isReady()) {