Author: croberts
Date: 2012-04-17 17:44:16 +0000 (Tue, 17 Apr 2012)
New Revision: 5307
Modified:
branches/play_plumage/cumin/bin/cumin-report
branches/play_plumage/mint/python/mint/plumage/main.py
branches/play_plumage/mint/python/mint/plumage/session.py
Log:
Small refactoring of cumin-report gathering of the plumage server information.
Modified: branches/play_plumage/cumin/bin/cumin-report
===================================================================
--- branches/play_plumage/cumin/bin/cumin-report 2012-04-17 16:14:47 UTC (rev 5306)
+++ branches/play_plumage/cumin/bin/cumin-report 2012-04-17 17:44:16 UTC (rev 5307)
@@ -142,11 +142,8 @@
model_dir = [os.path.join(config.home, x) for x in ("model/admin",
"model/plumage")]
- broker_uris = []
-# broker_uris = [x.strip() for x in opts.brokers.split(",")]
+ mint = Plumage(model_dir, values.plumage_host, values.plumage_port,
opts.database)
- mint = Plumage(model_dir, broker_uris, opts.database)
-
mint.print_event_level = opts.print_events
mint.expire_enabled = opts.expire_enabled
Modified: branches/play_plumage/mint/python/mint/plumage/main.py
===================================================================
--- branches/play_plumage/mint/python/mint/plumage/main.py 2012-04-17 16:14:47 UTC (rev
5306)
+++ branches/play_plumage/mint/python/mint/plumage/main.py 2012-04-17 17:44:16 UTC (rev
5307)
@@ -12,7 +12,7 @@
log = logging.getLogger("mint.plumage")
class Plumage(object):
- def __init__(self, model_dir, server_url, database_dsn):
+ def __init__(self, model_dir, server_host, server_port, database_dsn):
# Can we just use a different model dir here?
# That would control visible packages, vacuuming, etc.
@@ -22,7 +22,7 @@
self.database = MintDatabase(self, database_dsn)
self.admin = CuminAdmin(self)
self.update_thread = UpdateThread(self)
- self.session = PlumageSession(self, server_url)
+ self.session = PlumageSession(self, server_host, server_port)
self.expire_enabled = True
self.expire_thread = ExpireThread(self)
Modified: branches/play_plumage/mint/python/mint/plumage/session.py
===================================================================
--- branches/play_plumage/mint/python/mint/plumage/session.py 2012-04-17 16:14:47 UTC (rev
5306)
+++ branches/play_plumage/mint/python/mint/plumage/session.py 2012-04-17 17:44:16 UTC (rev
5307)
@@ -16,9 +16,10 @@
UTC_DIFF = datetime.utcnow() - datetime.now()
class PlumageSession(object):
- def __init__(self, app, server_url):
+ def __init__(self, app, server_host, server_port):
self.app = app
- self.server_url = server_url
+ self.server_host = server_host
+ self.server_port = server_port
self.threads = []
def check(self):
@@ -38,7 +39,8 @@
# We're going to have a thread for this...
self.threads.append(PlumageSessionThread(
self.app,
- self.server_url,
+ self.server_host,
+ self.server_port,
cls))
# Update our list, minus the black_list
@@ -53,7 +55,8 @@
for cls in pkg._classes:
self.threads.append(PlumageSessionThread(
self.app,
- self.server_url,
+ self.server_host,
+ self.server_port,
cls))
def start(self):
log.info("Starting %s", self)
@@ -66,15 +69,14 @@
t.stop()
def __repr__(self):
- return "%s(%s)" % (self.__class__.__name__, self.server_url)
+ return "%s(%s:%s)" % (self.__class__.__name__, self.server_host,
self.server_port)
class PlumageSessionThread(MintDaemonThread):
- def __init__(self, app, server_url, cls):
+ def __init__(self, app, server_host, server_port, cls):
super(PlumageSessionThread, self).__init__(app)
- self.server_url = server_url
self.cls = cls
- self.connection = Connection(app.plumage_host, app.plumage_port) #Needs to be
from config
+ self.connection = Connection(server_host, server_port) #Needs to be from config
self.database = Database(self.connection, self.cls.database)
self.collection = Collection(self.database, self.cls.collection)