Changeset 5524

Timestamp:

11/03/09 11:31:32 (3 weeks ago)

Author:

kisielk

Message:

Moved launchd plist cache to init function.

Files:

• trunk/bcfg2/src/lib/Client/Tools/launchd.py (modified) (2 diffs)

trunk/bcfg2/src/lib/Client/Tools/launchd.py

@@ -5 +5 @@
 import Bcfg2.Client.Tools
 import popen2
-
-'''Locate plist file that provides given reverse-fqdn name
-/Library/LaunchAgents          Per-user agents provided by the administrator.
-/Library/LaunchDaemons         System wide daemons provided by the administrator.
-/System/Library/LaunchAgents   Mac OS X Per-user agents.
-/System/Library/LaunchDaemons  Mac OS X System wide daemons.'''
-plistLocations = ["/Library/LaunchDaemons", "/System/Library/LaunchDaemons"]
-plistMapping = {}
-for directory in plistLocations:
-    for daemon in os.listdir(directory):
-        try:
-            if daemon.endswith(".plist"):
-                d = daemon[:-6]
-            else:
-                d = daemon
-            (stdout, _) = popen2.popen2('defaults read %s/%s Label' % (directory, d))
-            label = stdout.read().strip()
-            plistMapping[label] = "%s/%s" % (directory, daemon)
-        except KeyError: #perhaps this could be more robust
-            pass
 
 class launchd(Bcfg2.Client.Tools.Tool):
@@ -37 +17 @@
     and Name is acually a reverse-fqdn (or the label)
     '''
+    def __init__(self, logger, setup, config):
+        Bcfg2.Client.Tools.Tool.__init__(self, logger, setup, config)
+
+        '''Locate plist file that provides given reverse-fqdn name
+        /Library/LaunchAgents          Per-user agents provided by the administrator.
+        /Library/LaunchDaemons         System wide daemons provided by the administrator.
+        /System/Library/LaunchAgents   Mac OS X Per-user agents.
+        /System/Library/LaunchDaemons  Mac OS X System wide daemons.'''
+        plistLocations = ["/Library/LaunchDaemons", "/System/Library/LaunchDaemons"]
+        self.plistMapping = {}
+        for directory in plistLocations:
+            for daemon in os.listdir(directory):
+                try:
+                    if daemon.endswith(".plist"):
+                        d = daemon[:-6]
+                    else:
+                        d = daemon
+                    (stdout, _) = popen2.popen2('defaults read %s/%s Label' % (directory, d))
+                    label = stdout.read().strip()
+                    self.plistMapping[label] = "%s/%s" % (directory, daemon)
+                except KeyError: #perhaps this could be more robust
+                    pass
+
     def FindPlist(self, entry):
-        return plistMapping.get(entry.get('name'), None)
+        return self.plistMapping.get(entry.get('name'), None)
 
     def os_version(self):