Enabled launchd as valid service; support is completely untested at this point. To use; install launchd plist files as configuration files, then setup a launchd service entry to make sure the item is loaded.

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2619 ce84e21b-d406-0410-9b95-82705330c041

2 files changed, 13 insertions, 12 deletions

diff --git a/src/lib/Client/Tools/__init__.py b/src/lib/Client/Tools/__init__.py
index 56d9aba8b..bebe0a9d7 100644
--- a/src/lib/Client/Tools/__init__.py
+++ b/src/lib/Client/Tools/__init__.py
@@ -2,7 +2,7 @@
 __revision__ = '$Revision$'
 
 __all__ = ["APT", "Blast", "Chkconfig", "DebInit", "Encap", "Portage",
-           "PostInstall", "POSIX", "RPM", "RcUpdate", "SMF", "SYSV"]
+           "PostInstall", "POSIX", "RPM", "RcUpdate", "SMF", "SYSV", "launchd"]
 
 import os, popen2, stat, sys, Bcfg2.Client.XML
 
diff --git a/src/lib/Client/Tools/launchd.py b/src/lib/Client/Tools/launchd.py
index 001d42ea4..6c4c0e2f2 100644
--- a/src/lib/Client/Tools/launchd.py
+++ b/src/lib/Client/Tools/launchd.py
@@ -4,11 +4,11 @@ __revision__ = '$Revision: 2596 $'
 import glob, os
 import Bcfg2.Client.Tools
 
-class LaunchD(Bcfg2.Client.Tools.Tool):
+class launchd(Bcfg2.Client.Tools.Tool):
     '''Support for Mac OS X Launchd Services'''
     __handles__ = [('Service', 'launchd')]
     __execs__ = ['/bin/launchctl', '/usr/bin/defaults']
-    __name__ = 'LaunchD'
+    __name__ = 'launchd'
     __req__ = {'Service':['name', 'status']}
 
     #currently requires the path to the plist to load/unload, and Name is acually a reverse-fqdn (or the label)
@@ -37,38 +37,39 @@ class LaunchD(Bcfg2.Client.Tools.Tool):
     def VerifyService(self, entry, _):
         '''Verify Launchd Service Entry'''
         try:
-            services = self.cmd.run("/bin/launchctl list")
+            services = self.cmd.run("/bin/launchctl list")[1]
         except IndexError:#happens when no services are running (should be never)
             services = []
         if entry.get('name') in services:#doesn't check if non-spawning services are Started
             return entry.get('status') == 'on'
         else:
-            self.logger.debug("Didn't find service Loaded (LaunchD running under same user as bcfg)")
+            self.logger.debug("Didn't find service Loaded (launchd running under same user as bcfg)")
             return entry.get('status') == 'off'
 
         try: #Perhaps add the "-w" flag to load and unload to modify the file itself!
             self.cmd.run("/bin/launchctl load %s" % self.FindPlist(entry))
         except IndexError:
-            return "on"
-        return "off"
+            return 'on'
+        return False
 
 
     def InstallService(self, entry):
-        '''Enable or Disable LaunchD Item'''
+        '''Enable or Disable launchd Item'''
         if entry.get('status') == 'on':
             cmdrc = self.cmd.run("/bin/launchctl load -w %s" % self.FindPlist(entry))[0]
         else:
+            #we might want to stop services ehre? that could effectively kill things that were up?
             cmdrc = self.cmd.run("/bin/launchctl unload -w %s" % self.FindPlist(entry))[0]
         return cmdrc == 0
 
     def Remove(self, svcs):
-        '''Remove Extra LaunchD entries'''
+        '''Remove Extra launchd entries'''
         pass
         
 
 
     def FindExtra(self):
-        '''Find Extra LaunchD Services'''
+        '''Find Extra launchd Services'''
         allsrv =  self.cmd.run("/bin/launchctl list")
 
         [allsrv.remove(svc) for svc in self.getSupportedEntries() if svc in allsrv]
@@ -76,14 +77,14 @@ class LaunchD(Bcfg2.Client.Tools.Tool):
                 for name in allsrv]
 
     def BundleUpdated(self, bundle):
-        '''Reload LaunchD plist'''
+        '''Reload launchd plist'''
         for entry in [entry for entry in bundle if self.handlesEntry(entry)]:
             if not self.canInstall(entry):
                 self.logger.error("Insufficient information to restart service %s" % (entry.get('name')))
             else:
                 if entry.get('status') == 'on' and self.FindPlist(entry):
                     #may need to start/stop as well!
-                    self.logger.info("Reloading LaunchD  service %s" % (entry.get("name")))
+                    self.logger.info("Reloading launchd  service %s" % (entry.get("name")))
                     #stop?
                     self.cmd.run("/bin/launchctl unload %s" % (self.FindPlist(entry)))#what if it disappeared? how do we stop services that are currently running but the plist disappeared?!
                     self.cmd.run("/bin/launchctl load %s" % (self.FindPlist(entry)))