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 19:59:57 UTC
svn commit: r1339830 - in /incubator/tashi/trunk/src/tashi:
accounting/accounting.py agents/primitive.py utils/config.py
Author: stroucki
Date: Thu May 17 19:59:57 2012
New Revision: 1339830
URL: http://svn.apache.org/viewvc?rev=1339830&view=rev
Log:
config: pass through items() to ConfigParser object
primitive: use soft config
accounting: use soft config
Modified:
incubator/tashi/trunk/src/tashi/accounting/accounting.py
incubator/tashi/trunk/src/tashi/agents/primitive.py
incubator/tashi/trunk/src/tashi/utils/config.py
Modified: incubator/tashi/trunk/src/tashi/accounting/accounting.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/accounting/accounting.py?rev=1339830&r1=1339829&r2=1339830&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/accounting/accounting.py (original)
+++ incubator/tashi/trunk/src/tashi/accounting/accounting.py Thu May 17 19:59:57 2012
@@ -28,7 +28,9 @@ from rpyc.utils.server import ThreadedSe
#from rpyc.utils.authenticators import TlsliteVdbAuthenticator
#from tashi.rpycservices.rpyctypes import *
-from tashi.util import getConfig, createClient, instantiateImplementation, boolean, debugConsole
+from tashi.util import createClient, instantiateImplementation, boolean, debugConsole
+from tashi.utils.config import Config
+
import tashi
class Accounting(object):
@@ -69,7 +71,8 @@ class Accounting(object):
sys.exit(0)
def main():
- (config, configFiles) = getConfig(["Accounting"])
+ config = Config(["Accounting"])
+ configFiles = config.getFiles()
publisher = instantiateImplementation(config.get("Accounting", "publisher"), config)
tashi.publisher = publisher
logging.config.fileConfig(configFiles)
Modified: incubator/tashi/trunk/src/tashi/agents/primitive.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/agents/primitive.py?rev=1339830&r1=1339829&r2=1339830&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/agents/primitive.py (original)
+++ incubator/tashi/trunk/src/tashi/agents/primitive.py Thu May 17 19:59:57 2012
@@ -23,7 +23,8 @@ import sys
from tashi.rpycservices.rpyctypes import Errors, HostState, InstanceState, TashiException
-from tashi.util import getConfig, createClient, instantiateImplementation, boolean
+from tashi.util import createClient, instantiateImplementation, boolean
+from tashi.utils.config import Config
import tashi
class Primitive(object):
@@ -298,7 +299,9 @@ class Primitive(object):
time.sleep(self.scheduleDelay)
def main():
- (config, configFiles) = getConfig(["Agent"])
+ config = Config(["Agent"])
+ configFiles = config.getFiles()
+
publisher = instantiateImplementation(config.get("Agent", "publisher"), config)
tashi.publisher = publisher
logging.config.fileConfig(configFiles)
Modified: incubator/tashi/trunk/src/tashi/utils/config.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/utils/config.py?rev=1339830&r1=1339829&r2=1339830&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/utils/config.py (original)
+++ incubator/tashi/trunk/src/tashi/utils/config.py Thu May 17 19:59:57 2012
@@ -54,3 +54,6 @@ class Config:
pass
return value
+
+ def items(self, *args, **kwargs):
+ return self.config.items(*args, **kwargs)