Optimize the service selector for the "-s <svcname>" case

No need to build the services in this case. Just check the svc exists.

lib/node.py

@@ -39,7 +39,7 @@
 from rcColor import formatter
 from rcUtilities import justcall, lazy, lazy_initialized, vcall, check_privs, \
                         call, which, purge_cache_expired, read_cf, unset_lazy, \
-                        drop_option, is_string, try_decode
+                        drop_option, is_string, try_decode, is_service
 from converters import *
 from comm import Crypt
 from extconfig import ExtConfig
@@ -542,6 +542,8 @@ def svcs_selector(self, selector):
         """
         if os.environ.get("OSVC_SERVICE_LINK"):
             return [os.environ.get("OSVC_SERVICE_LINK")]
+        if is_service(selector):
+            return [selector]
         self.build_services(minimal=True)
         try:
             return self._svcs_selector(selector)

lib/rcUtilities.py

@@ -1061,6 +1061,17 @@ def chunker(buff, n):
     for i in range(0, len(buff), n):
         yield buff[i:i+n]
 
+def is_service(f):
+    if f is None:
+        return False
+    if os.sep not in f:
+        f = os.path.join(rcEnv.paths.pathetc, f)
+    if os.name != "nt" and os.path.realpath(f) != os.path.realpath(rcEnv.paths.svcmgr):
+        return False
+    if not os.path.exists(f + '.conf'):
+        return False
+    return True
+
 if __name__ == "__main__":
     #print("call(('id','-a'))")
     #(r,output,err)=call(("/usr/bin/id","-a"))

lib/svcBuilder.py

@@ -10,7 +10,7 @@
 import resSyncRsync
 import rcExceptions as ex
 import rcConfigParser
-from rcUtilities import cmdline2list, ximport, check_privs
+from rcUtilities import cmdline2list, ximport, check_privs, is_service
 
 if 'PATH' not in os.environ:
     os.environ['PATH'] = ""
@@ -2243,15 +2243,6 @@ def build(name, minimal=False, svcconf=None, node=None):
     svc.post_build()
     return svc
 
-def is_service(f):
-    if os.name == 'nt':
-        return True
-    if os.path.realpath(f) != os.path.realpath(rcEnv.paths.svcmgr):
-        return False
-    if not os.path.exists(f + '.conf'):
-        return False
-    return True
-
 def list_services():
     if not os.path.exists(rcEnv.paths.pathetc):
         print("create dir %s"%rcEnv.paths.pathetc)