Author: tmckay
Date: 2011-03-23 20:47:35 +0000 (Wed, 23 Mar 2011)
New Revision: 4662
Modified:
trunk/cumin/bin/cumin-data
trunk/mint/python/mint/session.py
Log:
Add internal package filter for things that should not be bound
Fix, include-classes should be all classes when unspecified
Modified: trunk/cumin/bin/cumin-data
===================================================================
--- trunk/cumin/bin/cumin-data 2011-03-23 19:40:57 UTC (rev 4661)
+++ trunk/cumin/bin/cumin-data 2011-03-23 20:47:35 UTC (rev 4662)
@@ -15,7 +15,7 @@
sys.stderr = sys.__stderr__
sys.stdout = sys.__stdout__
-def process_classes(mint, values, section_name):
+def process_classes(mint, values, section_name, on_empty=None):
return_code = 0
pkgs = set()
@@ -48,7 +48,10 @@
except KeyError:
log.warning("Configuration section '%s',"\
" package '%s' not found" % (section_name,
pname))
-
+ elif on_empty == "all":
+ for pkg in mint.model._packages:
+ pkgs = pkgs.union(set(pkg._classes))
+
return return_code, pkgs
def main():
@@ -134,13 +137,14 @@
return_code, includes = process_classes(mint,
values.include_classes,
- opts.section)
+ opts.section,
on_empty="all")
return_code, excludes = process_classes(mint,
values.exclude_classes,
opts.section)
- mint.session.qmf_classes = includes.difference(excludes)
+ if values.include_classes or values.exclude_classes:
+ mint.session.qmf_classes = includes.difference(excludes)
if opts.init_only or return_code:
return
Modified: trunk/mint/python/mint/session.py
===================================================================
--- trunk/mint/python/mint/session.py 2011-03-23 19:40:57 UTC (rev 4661)
+++ trunk/mint/python/mint/session.py 2011-03-23 20:47:35 UTC (rev 4662)
@@ -45,18 +45,24 @@
self.qmf_session.bindAgent("*")
+ # Filter out classes we know should not be bound at this point in time
+ # This is to prevent confusion in log files.
+ package_filter = ["com.redhat.cumin",
"com.redhat.cumin.grid"]
+
# Handle bind by class
if self.qmf_classes:
for cls in self.qmf_classes:
pname = cls._package._name
cname = cls._name
- self.qmf_session.bindClass(pname.lower(), cname.lower())
- log.info("Binding QMF class %s.%s" % (pname, cname))
+ if pname not in package_filter:
+ self.qmf_session.bindClass(pname.lower(), cname.lower())
+ log.info("Binding QMF class %s.%s" % (pname, cname))
else:
# Handle bind by package
for pkg in self.app.model._packages:
- self.qmf_session.bindPackage(pkg._name.lower())
- log.info("Binding QMF package %s" % pkg._name)
+ if pkg._name not in package_filter:
+ self.qmf_session.bindPackage(pkg._name.lower())
+ log.info("Binding QMF package %s" % pkg._name)
for uri in self.broker_uris:
self.add_broker(uri)
Show replies by date