Module: check_mk
Branch: master
Commit: 52e69842a7c38ddcd1072b34ba2aba534938f8b3
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52e69842a7c38d…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Apr 28 18:07:57 2016 +0200
Fixed pylint issues in agent plugins
---
agents/plugins/mk_logwatch | 10 +++++++---
agents/plugins/plesk_backups | 2 ++
agents/plugins/plesk_domains | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch
index 96f548f..5d949c8 100755
--- a/agents/plugins/mk_logwatch
+++ b/agents/plugins/mk_logwatch
@@ -111,20 +111,24 @@ def read_config():
config = []
for line in config_lines:
- rewrite = False
if line[0].isspace(): # pattern line
if not have_filenames:
raise Exception("Missing logfile names")
+
level, pattern = line.split(None, 1)
+ cont_list = [] # List of continuation patterns
+ rewrite_list = [] # List of rewrite patterns
+
if level == 'A':
cont_list.append(parse_cont_pattern(pattern))
elif level == 'R':
rewrite_list.append(pattern)
else:
level, compiled = parse_pattern(level, pattern, line)
- cont_list = [] # List of continuation patterns
- rewrite_list = [] # List of rewrite patterns
+ cont_list = []
+ rewrite_list = []
patterns.append((level, compiled, cont_list, rewrite_list))
+
else: # filename line
patterns = []
config.append((parse_filenames(line), patterns))
diff --git a/agents/plugins/plesk_backups b/agents/plugins/plesk_backups
index 9febfad..9da5a3b 100755
--- a/agents/plugins/plesk_backups
+++ b/agents/plugins/plesk_backups
@@ -34,6 +34,8 @@ import MySQLdb, sys, datetime, time, os
from ftplib import FTP
def connect():
+ # Fix pylint issues in case MySQLdb is not present
+ # pylint: disable=no-member
try:
return MySQLdb.connect(
host = 'localhost',
diff --git a/agents/plugins/plesk_domains b/agents/plugins/plesk_domains
index b862c74..4237bc7 100755
--- a/agents/plugins/plesk_domains
+++ b/agents/plugins/plesk_domains
@@ -40,7 +40,7 @@ try:
passwd = file('/etc/psa/.psa.shadow').read().strip(),
charset = 'utf8',
)
-except MySQLdb.Error, e:
+except MySQLdb.Error, e: # pylint: disable=no-member
sys.stderr.write("MySQL-Error %d: %s\n" % (e.args[0], e.args[1]))
sys.exit(1)