monit: overwrite __eq__, __ne__ in child classes (lgtm warnings) (#7387)
* overwrite __eq__, __ne__ in child class (lgtm warnings) * overwrite __hash__ * auto format
Ilya Mashchenko committed
Dec 4, 2019 at 13:01 UTC
14b12074fd61e4e5c00a8aac4ed01b8a6cb74bd0
1 file changed
+22
-6
collectors/python.d.plugin/monit/monit.chart.py
+22
-6
@@ -4,12 +4,10 @@
4
# SPDX-License-Identifier: GPL-3.0-or-later
5
6
import xml.etree.ElementTree as ET
7
-
7
from collections import namedtuple
8
9
from bases.FrameworkServices.UrlService import UrlService
10
12
-
11
MonitType = namedtuple('MonitType', ('index', 'name'))
12
13
# see enum Service_Type from monit.h (https://bitbucket.org/tildeslash/monit/src/master/src/monit.h)
@@ -122,7 +120,7 @@ CHARTS = {
120
121
122
class BaseMonitService(object):
125
- def __init__(self, typ, name, status, monitor):
123
+ def __init__(self, typ, name, status, monitor):
124
self.type = typ
125
self.name = name
126
self.status = status
@@ -153,12 +151,21 @@ class BaseMonitService(object):
151
152
153
class ProcessMonitService(BaseMonitService):
156
- def __init__(self, typ, name, status, monitor):
154
+ def __init__(self, typ, name, status, monitor):
155
super(ProcessMonitService, self).__init__(typ, name, status, monitor)
156
self.uptime = None
157
self.threads = None
158
self.children = None
159
160
+ def __eq__(self, other):
161
+ return super(ProcessMonitService, self).__eq__(other)
162
+
163
+ def __ne__(self, other):
164
+ return super(ProcessMonitService, self).__ne__(other)
165
+
166
+ def __hash__(self):
167
+ return super(ProcessMonitService, self).__hash__()
168
+
169
def uptime_key(self):
170
return 'process_uptime_{0}'.format(self.name)
171
@@ -183,16 +190,25 @@ class ProcessMonitService(BaseMonitService):
190
191
192
class HostMonitService(BaseMonitService):
186
- def __init__(self, typ, name, status, monitor):
193
+ def __init__(self, typ, name, status, monitor):
194
super(HostMonitService, self).__init__(typ, name, status, monitor)
195
self.latency = None
196
197
+ def __eq__(self, other):
198
+ return super(HostMonitService, self).__eq__(other)
199
+
200
+ def __ne__(self, other):
201
+ return super(HostMonitService, self).__ne__(other)
202
+
203
+ def __hash__(self):
204
+ return super(HostMonitService, self).__hash__()
205
+
206
def latency_key(self):
207
return 'host_latency_{0}'.format(self.name)
208
209
def data(self):
210
base_data = super(HostMonitService, self).data()
195
- latency = float(self.latency) * 1000000 if self.latency else None
211
+ latency = float(self.latency) * 1000000 if self.latency else None
212
data = {self.latency_key(): latency}
213
data.update(base_data)
214