incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tvansteenbu...@apache.org
Subject git commit: [#7142] check config, not zmq package, to determine whether to try to send a zarkov event
Date Fri, 21 Feb 2014 17:43:06 GMT
Repository: incubator-allura
Updated Branches:
  refs/heads/master a75304309 -> 8a6bf21e6


[#7142] check config, not zmq package, to determine whether to try to send a zarkov event


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/8a6bf21e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/8a6bf21e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/8a6bf21e

Branch: refs/heads/master
Commit: 8a6bf21e667b8c82621e8ed33a01811136470a7e
Parents: a753043
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Fri Feb 14 20:45:28 2014 +0000
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Fri Feb 21 17:42:45 2014 +0000

----------------------------------------------------------------------
 Allura/allura/lib/app_globals.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8a6bf21e/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index 0ebb370..f46c1eb 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -63,7 +63,7 @@ from allura.lib.widgets import analytics
 from allura.lib.security import Credentials
 from allura.lib.async import Connection, MockAMQ
 from allura.lib.solr import MockSOLR, make_solr_from_config
-from allura.lib.zarkov_helpers import ZarkovClient, zmq
+from allura.lib.zarkov_helpers import ZarkovClient
 
 log = logging.getLogger(__name__)
 
@@ -334,7 +334,7 @@ class Globals(object):
             mount_point=None,
             is_project_member=False)
 
-        if not zmq:
+        if not config.get('zarkov.host'):
             return
 
         user = user or getattr(c, 'user', None)


Mime
View raw message