[Opensrf-commits] r2077 - trunk/src/python (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-11-13 23:15:24 -0500 (Sat, 13 Nov 2010)
New Revision: 2077

Modified:
   trunk/src/python/opensrf.py.in
Log:
Limit list of Python services to those within the domain-specific activeapps section

Fix up help with correct default PID directory and document list_all action


Modified: trunk/src/python/opensrf.py.in
===================================================================
--- trunk/src/python/opensrf.py.in	2010-11-11 14:47:12 UTC (rev 2076)
+++ trunk/src/python/opensrf.py.in	2010-11-14 04:15:24 UTC (rev 2077)
@@ -36,6 +36,7 @@
 
     Options:
         -a <action>
+            list_all -- List all services
             start   -- Start a service
             stop    -- stop a service
             restart -- restart a service
@@ -53,7 +54,7 @@
             The OpenSRF config file context
 
         -p <PID dir>
-            The location of application PID files.  Default is /tmp
+            The location of application PID files.  Default is @PID_DIR@/run/opensrf
 
         -d 
             If set, run in daemon (background) mode.  This creates a PID 
@@ -94,13 +95,13 @@
     osrf.set.load(domain)
 
     settings = osrf.set.get('apps')
+    activeapps = osrf.set.get('activeapps')
 
-    for key in settings.keys():
+    for key in (set(settings.keys()) & set(activeapps['appname'])):
         svc = settings[key]
         if isinstance(svc, dict) and 'language' in svc and svc['language'] == 'python':
             services[key] = svc
 
-
 def do_start(service):
     '''
     Start the named Python service