base: _admin_socket function updated to allow easier reuse of the base class

diff --git a/collectors/base.py b/collectors/base.py
index 087043f7d44107c71e7551635331da8b933d2f4c..dea51c130fdc059800955815fd0bfcd3c90e000f 100644 (file)
--- a/collectors/base.py
+++ b/collectors/base.py
@@ -1,9 +1,11 @@
 #!/usr/bin/env python
+
 from ceph_daemon import admin_socket
 import json
 from collectors.common import CollectorLog
 import time
 
+
 class BaseCollector(object):
 
     def __init__(self, cluster_name, admin_socket=None, log_level='debug'):
@@ -14,12 +16,15 @@ class BaseCollector(object):
         self.logger = CollectorLog(log_type=class_name,
                                    log_level=log_level)
 
-    def _admin_socket(self, cmds=None):
+    def _admin_socket(self, cmds=None, socket_path=None):
+
+        adm_socket = self.admin_socket if not socket_path else socket_path
+
         if not cmds:
             cmds = ['perf', 'dump']
 
         start = time.time()
-        response = admin_socket(self.admin_socket, cmds,
+        response = admin_socket(adm_socket, cmds,
                                 format='json')
         end = time.time()