Monitoring/nagios-plugins
1
0
Fork 0
mirror of https://github.com/opinkerfi/nagios-plugins.git synced 2024-11-22 10:23:46 +01:00
Code Issues Releases Wiki Activity

check_package_updates - minor refactor

Browse Source 
Few very minor readability tricks

* replacing the typical "if x not in list: list[x] = ..."  pattern with defaultdict
* replace string.split('\n') with splitlines()
This commit is contained in:
Pall Sigurdsson 2013-09-13 11:51:16 +00:00
parent f3909a08f6
commit 25b04e822e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
check_package_updates/check_package_updates
View File

@ -17,7 +17,7 @@
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
from pynag.Plugins import PluginHelper, unknown, ok from pynag.Plugins import PluginHelper, unknown, ok
from collections import defaultdict
known_types = ['Enhancement', 'Normal', 'Bug fix', 'Security'] known_types = ['Enhancement', 'Normal', 'Bug fix', 'Security']
@ -57,7 +57,9 @@ def pkcon_get_updates():
:return: { "Bug fix": [ "pkg-1.0.1", "anthr-pkg-3.1.4" ], "Security": [ "pkg2-2.1.1" ], :return: { "Bug fix": [ "pkg-1.0.1", "anthr-pkg-3.1.4" ], "Security": [ "pkg2-2.1.1" ],
""" """
update_types = {} update_types = defaultdict(list)
for t in known_types:
update_types[t] = []
stdout = "" stdout = ""
stderr = "" stderr = ""
@ -72,7 +74,7 @@ def pkcon_get_updates():
total_updates = 0 total_updates = 0
results_section = False results_section = False
for line in stdout.split("\n"): for line in stdout.splitlines():
if not line: if not line:
continue continue
if line.startswith("There are no updates"): if line.startswith("There are no updates"):
@ -83,8 +85,6 @@ def pkcon_get_updates():
update_type = line[:13].strip() update_type = line[:13].strip()
update_package = line[13:].strip() update_package = line[13:].strip()
if update_type not in update_types:
update_types[update_type] = []
update_types[update_type].append(update_package) update_types[update_type].append(update_package)
total_updates += 1 total_updates += 1
@ -94,9 +94,6 @@ def pkcon_get_updates():
if results_section is False: if results_section is False:
raise Exception("pkcon returned no 'Results:' section. Output of pkcon command:\n" + stdout) raise Exception("pkcon returned no 'Results:' section. Output of pkcon command:\n" + stdout)
for t in known_types:
if t not in update_types:
update_types[t] = []
return total_updates, update_types return total_updates, update_types