Sandro Bonazzola has uploaded a new change for review.
Change subject: sos - fixed behaviour when -a option is used
......................................................................
sos - fixed behaviour when -a option is used
calling sosreport -a -o postgresql set all the
postgresql plugin options to True which was an
unexpected and unhandled value.
Fixed also some minor issues like wrong indentation,
instance attribute declaration out of __init__,
file built-in redefinition.
Change-Id: Ifcebf02bd96bec18094175d97013bee1c54b5e34
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M src/sos/plugins/postgresql.py
1 file changed, 40 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-log-collector
refs/changes/35/13235/1
diff --git a/src/sos/plugins/postgresql.py b/src/sos/plugins/postgresql.py
index 9269efb..a20bf55 100644
--- a/src/sos/plugins/postgresql.py
+++ b/src/sos/plugins/postgresql.py
@@ -57,11 +57,18 @@
('dbport', 'database server port number (default=5432)', '', False)
]
+ def __init__(self, pluginname, commons):
+ sos.plugintools.PluginBase.__init__(self, pluginname, commons)
+ self.tmp_dir = None
+
def pg_dump(self):
dest_file = os.path.join(self.tmp_dir, "sos_pgdump.tar")
old_env_pgpassword = os.environ.get("PGPASSWORD")
os.environ["PGPASSWORD"] = "%s" % (self.getOption("password"))
- if self.getOption("dbhost"):
+ if (
+ self.getOption("dbhost") and
+ self.getOption("dbhost") is not True
+ ):
cmd = "pg_dump -U %s -h %s -p %s -w -f %s -F t %s" % (
self.__username,
self.getOption("dbhost"),
@@ -90,15 +97,30 @@
)
def setup(self):
- if self.getOption("pghome"):
+ if (
+ self.getOption("pghome") and
+ self.getOption("pghome") is not True
+ ):
self.__pghome = self.getOption("pghome")
- self.soslog.debug("using pghome=%s" % self.__pghome)
+ self.soslog.debug("using pghome=%s" % self.__pghome)
- if self.getOption("dbname"):
- if self.getOption("password"):
- if self.getOption("username"):
+ if (
+ self.getOption("dbname") and
+ self.getOption("dbname") is not True
+ ):
+ if (
+ self.getOption("password") and
+ self.getOption("password") is not True
+ ):
+ if (
+ self.getOption("username") and
+ self.getOption("username") is not True
+ ):
self.__username = self.getOption("username")
- if self.getOption("dbport"):
+ if (
+ self.getOption("dbport") and
+ self.getOption("dbport") is not True
+ ):
self.__dbport = self.getOption("dbport")
self.tmp_dir = tempfile.mkdtemp()
self.pg_dump()
@@ -110,19 +132,19 @@
"WARN: password must be supplied to dump a database."
)
else:
- self.soslog.warning(
- "dbname must be supplied to dump a database."
- )
- self.addAlert(
- "WARN: dbname must be supplied to dump a database."
- )
+ self.soslog.warning(
+ "dbname must be supplied to dump a database."
+ )
+ self.addAlert(
+ "WARN: dbname must be supplied to dump a database."
+ )
# Copy PostgreSQL log files.
- for file in find("*.log", self.__pghome):
- self.addCopySpec(file)
+ for filename in find("*.log", self.__pghome):
+ self.addCopySpec(filename)
# Copy PostgreSQL config files.
- for file in find("*.conf", self.__pghome):
- self.addCopySpec(file)
+ for filename in find("*.conf", self.__pghome):
+ self.addCopySpec(filename)
self.addCopySpec(os.path.join(self.__pghome, "data", "PG_VERSION"))
self.addCopySpec(
@@ -133,7 +155,7 @@
import shutil
try:
shutil.rmtree(self.tmp_dir)
- except:
+ except shutil.Error:
self.soslog.exception(
"Unable to remove %s." % (self.tmp_dir)
)
--
To view, visit http://gerrit.ovirt.org/13235
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcebf02bd96bec18094175d97013bee1c54b5e34
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-log-collector
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
