From: Paul Cuzner <pcuzner@redhat.com>
Date: Thu, 6 Jul 2017 23:26:00 +0000 (+1200)
Subject: base: _admin_socket function updated to allow easier reuse of the base class
X-Git-Tag: v1.0~44^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d421b079874e23d374ccb610eeab0462c8afe716;p=cephmetrics.git

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

diff --git a/collectors/base.py b/collectors/base.py
index 087043f..dea51c1 100644
--- 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()