fixes in tune tool

vadv · vadv · commit ccef5569b3aa · 2016-11-18T14:03:26.000+03:00
diff --git a/mamonsu/tools/tune/pgsql.py b/mamonsu/tools/tune/pgsql.py
@@ -43,7 +43,7 @@ def _configure_extensions(self):
 
         if 'pg_stat_statements' in extensions:
             needed_libraries.append('pg_stat_statements')
-        elif 'pg_buffercache' in extensions:
+        if 'pg_buffercache' in extensions:
             needed_libraries.append('pg_buffercache')
         else:
             logging.warning("Please install 'contrib' modules: "
@@ -68,7 +68,7 @@ def _configure_extensions(self):
             libraries = needed_libraries
         else:
             libraries = libraries.split(',')
-            libraries = [ext.strip() for ext in libraries]
+            libraries = [ext.strip().strip('"') for ext in libraries]
             for candidate_ext in needed_libraries:
                 extension_found = False
                 for installed_ext in libraries:
@@ -81,7 +81,8 @@ def _configure_extensions(self):
                         extension_found = True
                 if not extension_found:
                     libraries.append(candidate_ext)
-        libraries = ','.join(libraries)
+        libraries = ["'{0}'".format(lib) for lib in libraries]
+        libraries = ', '.join(libraries)
         self._run_query(
             "alter system set shared_preload_libraries to {0};".format(
                 libraries))
diff --git a/tests/check.sh b/tests/check.sh
@@ -20,8 +20,10 @@ su postgres -c '/usr/pgsql-9.5/bin/initdb -D /var/lib/pgsql/9.5/data'
 su postgres -c '/usr/pgsql-9.5/bin/pg_ctl start -w -D /var/lib/pgsql/9.5/data'
 
 # mamonsu tune
+echo "shared_preload_libraries = '\"\$libdir/pg_stat_statements\"'" > /var/lib/pgsql/9.5/data/postgresql.auto.conf
 mamonsu tune
 su postgres -c '/usr/pgsql-9.5/bin/pg_ctl restart -w -D /var/lib/pgsql/9.5/data'
+grep "shared_preload_libraries \= '\"\$libdir/pg_stat_statements\", pg_buffercache'" /var/lib/pgsql/9.5/data/postgresql.auto.conf
 
 # mamonsu report
 (mamonsu report | grep version | grep 'PostgreSQL 9.5') || exit 1
