"postgres" module update
lgz committed
Oct 16, 2017 at 11:38 UTC
2bacee029a627ed5aced0b6bf9422114b5330411
1 file changed
+6
-4
python.d/postgres.chart.py
+6
-4
@@ -13,7 +13,7 @@ try:
13
except ImportError:
14
PSYCOPG2 = False
15
16
-from base import SimpleService
16
+from bases.FrameworkServices.SimpleService import SimpleService
17
18
# default module values
19
update_every = 1
@@ -257,7 +257,8 @@ class Service(SimpleService):
257
return False
258
result, error = self._connect()
259
if not result:
260
- conf = dict([(k, (lambda k, v: v if k != 'password' else '*****')(k, v)) for k, v in self.configuration.items()])
260
+ conf = dict((k, (lambda k, v: v if k != 'password' else '*****')(k, v))
261
+ for k, v in self.configuration.items())
262
self.error('Failed to connect to %s. Error: %s' % (str(conf), error))
263
return False
264
try:
@@ -266,8 +267,9 @@ class Service(SimpleService):
267
is_superuser = check_if_superuser_(cursor, QUERIES['IF_SUPERUSER'])
268
cursor.close()
269
269
- if (self.database_poll and isinstance(self.database_poll, str)):
270
- self.databases = [dbase for dbase in self.databases if dbase in self.database_poll.split()] or self.databases
270
+ if self.database_poll and isinstance(self.database_poll, str):
271
+ self.databases = [dbase for dbase in self.databases if dbase in self.database_poll.split()]\
272
+ or self.databases
273
274
self.locks_zeroed = populate_lock_types(self.databases)
275
self.add_additional_queries_(is_superuser)