You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/07/02 21:44:34 UTC
[2/3] git commit: [#4657] ticket:243 Add solr 'mail' core to the
globals
[#4657] ticket:243 Add solr 'mail' core to the globals
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/b3f80f68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/b3f80f68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/b3f80f68
Branch: refs/heads/db/4657
Commit: b3f80f689ea738a15e72c0db98c0b4ecd294d605
Parents: ebc7e43
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Feb 7 13:23:16 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Jul 2 19:44:19 2013 +0000
----------------------------------------------------------------------
Allura/allura/lib/app_globals.py | 6 ++++++
Allura/test.ini | 1 +
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b3f80f68/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index bdcacf7..62b1b3a 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -110,6 +110,12 @@ class Globals(object):
else: # pragma no cover
self.solr = None
self.solr_short_timeout = None
+ # SOLR mail core
+ self.solr_mail_server = config.get('solr.mail.server')
+ if asbool(config.get('solr.mail.mock')):
+ self.solr_mail = MockSOLR()
+ elif self.solr_mail_server:
+ self.solr_mail = Solr(self.solr_mail_server, timeout=int(config.get('solr.mail.timeout', 60)))
self.use_queue = asbool(config.get('use_queue', False))
# Load login/logout urls; only used for SFX logins
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b3f80f68/Allura/test.ini
----------------------------------------------------------------------
diff --git a/Allura/test.ini b/Allura/test.ini
index f1bd5f2..fad2acb 100644
--- a/Allura/test.ini
+++ b/Allura/test.ini
@@ -54,6 +54,7 @@ activitystream.timeline_collection = timelines
activitystream.enabled = true
solr.mock = true
+solr.mail.mock = true
amqp.mock = true
smtp.mock = true