Changeset 4879

Show
Ignore:
Timestamp:
08/15/08 13:17:58 (4 months ago)
Author:
desai
Message:

Switch probes to use plugin name for result routing (Resolves Ticket #594)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/bcfg2/src/lib/Server/Plugins/Metadata.py

    r4846 r4879  
    3333 
    3434class ProbeSet(Bcfg2.Server.Plugin.EntrySet): 
    35     def __init__(self, path, fam, encoding): 
     35    def __init__(self, path, fam, encoding, plugin_name): 
    3636        fpattern = '[0-9A-Za-z_\-]+' 
     37        self.plugin_name = plugin_name 
    3738        Bcfg2.Server.Plugin.EntrySet.__init__(self, fpattern, path, True,  
    3839                                              Bcfg2.Server.Plugin.SpecificData, 
    …… 
    6566            probe = lxml.etree.Element('probe') 
    6667            probe.set('name', name.split('/')[-1]) 
    67             probe.set('source', "Metadata") 
     68            probe.set('source', self.plugin_name) 
    6869            probe.text = entry.data 
    6970            match = self.bangline.match(entry.data.split('\n')[0]) 
    …… 
    115116        try: 
    116117            loc = datastore + "/Probes" 
    117             self.probes = ProbeSet(loc, core.fam, core.encoding) 
     118            self.probes = ProbeSet(loc, core.fam, core.encoding, self.__name__) 
    118119        except: 
    119120            self.probes = False