You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tashi-commits@incubator.apache.org by st...@apache.org on 2012/05/17 18:59:05 UTC
svn commit: r1339799 -
/incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py
Author: stroucki
Date: Thu May 17 18:59:05 2012
New Revision: 1339799
URL: http://svn.apache.org/viewvc?rev=1339799&view=rev
Log:
clustermanagerservice: use soft-config for default network
Modified:
incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py
Modified: incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py?rev=1339799&r1=1339798&r2=1339799&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py (original)
+++ incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py Thu May 17 18:59:05 2012
@@ -50,11 +50,7 @@ class ClusterManagerService(object):
self.maxMemory = int(self.config.get('ClusterManagerService', 'maxMemory'))
self.maxCores = int(self.config.get('ClusterManagerService', 'maxCores'))
- self.defaultNetwork = 0
- try:
- self.defaultNetwork = int(self.config.get('ClusterManagerService', 'defaultNetwork'))
- except:
- pass
+ self.defaultNetwork = self.config.getint('ClusterManagerService', 'defaultNetwork', 0)
self.allowDuplicateNames = boolean(self.config.get('ClusterManagerService', 'allowDuplicateNames'))