fix double connection to default database

Author: vadv

mamonsu/__init__.py

@@ -1,7 +1,7 @@
 __author__ = 'Dmitry Vasilyev'
 __author_email__ = '[email protected]'
 __description__ = 'Monitoring agent for PostgreSQL'
-__version__ = '2.2.5'
+__version__ = '2.2.6'
 __licence__ = 'BSD'
 
 __url__ = 'https://github.com/postgrespro/mamonsu'

mamonsu/plugins/pgsql/driver/_connection.py

@@ -9,21 +9,21 @@
 
 class ConnectionInfo(object):
 
-    def __init__(self, info={}):
-        self.info = info
-        self.host = self.info.get('host') or os.environ.get('PGHOST')
-        self.port = self.info.get('port') or int(os.environ.get('PGPORT') or 5432)
-        self.user = self.info.get('user') or os.environ.get('PGUSER')
-        self.passwd = self.info.get('passwd') or os.environ.get('PGPASSWORD')
-        self.db = self.info.get('db') or os.environ.get('PGDATABASE')
-        self.timeout = self.info.get('timeout') or int(
+    def __init__(self, connection_info={}):
+        self.connection_info = connection_info
+        self.host = self.connection_info.get('host') or os.environ.get('PGHOST')
+        self.port = self.connection_info.get('port') or int(os.environ.get('PGPORT') or 5432)
+        self.user = self.connection_info.get('user') or os.environ.get('PGUSER')
+        self.passwd = self.connection_info.get('passwd') or os.environ.get('PGPASSWORD')
+        self.default_db = self.connection_info.get('db') or os.environ.get('PGDATABASE')
+        self.timeout = self.connection_info.get('timeout') or int(
             os.environ.get('PGTIMEOUT') or 1)
-        self.appname = self.info.get('appname') or os.environ.get('PGAPPNAME')
-        self.log = logging.getLogger('PGSQL-({0})'.format(self.conn_str()))
+        self.appname = self.connection_info.get('appname') or os.environ.get('PGAPPNAME')
+        self.log = logging.getLogger('PGSQL-({0})'.format(self._connection_string()))
 
-    def conn_str(self):
+    def _connection_string(self):
         return 'host={0} db={1} user={2} port={3}'.format(
-            self.host, self.db, self.user, self.port)
+            self.host, self.default_db, self.user, self.port)
 
 
 class Connection(ConnectionInfo):
@@ -74,7 +74,7 @@ def _connect(self):
             unix_sock=unix_sock,
             host=host,
             port=self.port,
-            database=self.db,
+            database=self.default_db,
             application_name=self.appname
         )
         self.log.debug('connected')

mamonsu/plugins/pgsql/driver/pool.py

@@ -40,7 +40,7 @@ class Pool(ConnectionInfo):
 
     def __init__(self):
         super(Pool, self).__init__()
-        self.all_connections = {}
+        self._connections = {}
         self._cache = {
             'server_version': {'storage': {}},
             'bootstrap': {'storage': {}, 'counter': 0, 'cache': 10},
@@ -49,24 +49,27 @@ def __init__(self):
             'pgproee': {'storage': {}}
         }
 
+    def get_with_default_db(self, db=None):
+        if db is None:
+            return self.default_db
+        return db
+
     def connection_string(self, db=None):
-        self._init_connection(db)
-        return self.all_connections[db].conn_str()
+        db = self.get_with_default_db(db)
+        return self._connections[db]._connection_string()
 
     def query(self, query, db=None):
-        if db is None:
-            db = self.db
+        db = self.get_with_default_db(db)
         self._init_connection(db)
-        return self.all_connections[db].query(query)
+        return self._connections[db].query(query)
 
     def server_version(self, db=None):
         if db in self._cache['server_version']['storage']:
             return self._cache['server_version']['storage'][db]
         if platform.PY2:
             result = self.query('show server_version', db)[0][0]
         elif platform.PY3:
-            result = bytes(
-                self.query('show server_version', db)[0][0], 'utf-8')
+            result = bytes(self.query('show server_version', db)[0][0], 'utf-8')
         self._cache['server_version']['storage'][db] = '{0}'.format(
             result.decode('ascii'))
         return self._cache['server_version']['storage'][db]
@@ -84,7 +87,7 @@ def in_recovery(self, db=None):
                 return self._cache['recovery']['storage'][db]
         self._cache['recovery']['counter'] = 0
         self._cache['recovery']['storage'][db] = self.query(
-            "select pg_catalog.pg_is_in_recovery()")[0][0]
+            "select pg_catalog.pg_is_in_recovery()", db)[0][0]
         return self._cache['recovery']['storage'][db]
 
     def is_bootstraped(self, db=None):
@@ -98,10 +101,10 @@ def is_bootstraped(self, db=None):
         result = int(self.query(sql, db)[0][0])
         self._cache['bootstrap']['storage'][db] = (result == 1)
         if self._cache['bootstrap']['storage'][db]:
-            self.all_connections[db].log.info('Found mamonsu bootstrap')
+            self._connections[db].log.info('Found mamonsu bootstrap')
         else:
-            self.all_connections[db].log.info('Can\'t found mamonsu bootstrap')
-            self.all_connections[db].log.info('hint: run `mamonsu bootstrap` if you want to run without superuser rights')
+            self._connections[db].log.info('Can\'t found mamonsu bootstrap')
+            self._connections[db].log.info('hint: run `mamonsu bootstrap` if you want to run without superuser rights')
         return self._cache['bootstrap']['storage'][db]
 
     def is_pgpro(self, db=None):
@@ -150,8 +153,9 @@ def run_sql_type(self, typ, db=None):
         return self.query(self.get_sql(typ, db), db)
 
     def _init_connection(self, db):
-        if db not in self.all_connections:
+        db = self.get_with_default_db(db)
+        if db not in self._connections:
             # create new connection
-            info = self.info
-            info['db'] = db
-            self.all_connections[db] = Connection(info)
+            connection_info = self.connection_info
+            connection_info['db'] = db
+            self._connections[db] = Connection(connection_info)

packaging/debian/changelog

@@ -1,3 +1,9 @@
+mamonsu (2.2.6-1) stable; urgency=low
+
+  * bug fixes: memory and autovacuum plugin.
+
+ -- PostgresPro DBA <[email protected]>  Mon, 21 Nov 2016 16:00:00 +0300
+
 mamonsu (2.2.5-1) stable; urgency=low
 
   * memory and cfs plugin fixes

packaging/rpm/SPECS/mamonsu.spec

@@ -1,5 +1,5 @@
 Name:           mamonsu
-Version:        2.2.5
+Version:        2.2.6
 Release:        1%{?dist}
 Summary:        Monitoring agent for PostgreSQL
 Group:          Applications/Internet
@@ -70,6 +70,9 @@ chown mamonsu.mamonsu /var/log/mamonsu
 /sbin/chkconfig --del mamonsu
 
 %changelog
+* Mon Nov 21 2016 Dmitry Vasilyev <[email protected]> - 2.2.6-1
+- bug fixes: memory and autovacuum plugin
+
 * Fri Nov 18 2016 Dmitry Vasilyev <[email protected]> - 2.2.5-1
 - memory and cfs plugin fixes