postgres connect fix (#5617)
* connect fix * connect fix * minor * minor
Ilya Mashchenko committed
Mar 12, 2019 at 21:05 UTC
36c526ffc9f14ad4c792bba94c922c48627e16a4
1 file changed
+13
-12
collectors/python.d.plugin/postgres/postgres.chart.py
+13
-12
@@ -792,7 +792,6 @@ class Service(SimpleService):
792
self.do_table_stats = configuration.pop('table_stats', False)
793
self.do_index_stats = configuration.pop('index_stats', False)
794
self.databases_to_poll = configuration.pop('database_poll', None)
795
- self.statement_timeout = configuration.pop('statement_timeout', DEFAULT_STATEMENT_TIMEOUT)
795
self.configuration = configuration
796
self.conn = None
797
self.server_version = None
@@ -812,18 +811,20 @@ class Service(SimpleService):
811
self.conn.close()
812
self.conn = None
813
815
- try:
816
- params = dict(
817
- host=None,
818
- port=DEFAULT_PORT,
819
- database=None,
820
- user=DEFAULT_USER,
821
- password=None,
822
- connect_timeout=DEFAULT_CONNECT_TIMEOUT,
823
- options='-c statement_timeout={0}'.format(self.statement_timeout),
824
- )
825
- params.update(self.configuration)
814
+ conf = self.configuration
815
816
+ params = {
817
+ 'host': conf.get('host'),
818
+ 'port': conf.get('host', DEFAULT_PORT),
819
+ 'database': conf.get('database'),
820
+ 'user': conf.get('user', DEFAULT_USER),
821
+ 'password': conf.get('password'),
822
+ 'connect_timeout': conf.get('connect_timeout', DEFAULT_CONNECT_TIMEOUT),
823
+ 'options': '-c statement_timeout={0}'.format(
824
+ conf.get('statement_timeout', DEFAULT_STATEMENT_TIMEOUT)),
825
+ }
826
+
827
+ try:
828
self.conn = psycopg2.connect(**params)
829
self.conn.set_isolation_level(extensions.ISOLATION_LEVEL_AUTOCOMMIT)
830
self.conn.set_session(readonly=True)