Robot/contrib-munin
2
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2018-11-08 00:59:34 +01:00
Code Issues Releases Wiki Activity

Misc code improvements

Browse Source
This commit is contained in:
Neraud 2018-08-03 15:33:22 +02:00
parent a26b9e8db6
commit 397052a8e3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/git/git_commit_behind
View File

@ -96,8 +96,6 @@ GPLv2
=cut""" =cut"""
from __future__ import print_function
import logging import logging
import os import os
from random import randint from random import randint
@ -121,8 +119,8 @@ conf = {
'git_commit_behind.state') 'git_commit_behind.state')
} }
repo_codes = set([re.search('repo\.([^.]+)\..*', elem).group(1) repo_codes = set(re.search('repo\.([^.]+)\..*', elem).group(1)
for elem in os.environ.keys() if 'repo.' in elem]) for elem in os.environ.keys() if elem.startswith('repo.'))
repos_conf = {} repos_conf = {}
for code in repo_codes: for code in repo_codes:
@ -189,7 +187,7 @@ def get_info():
print('%s.value %d' % (repo_code, int(commits_behind))) print('%s.value %d' % (repo_code, int(commits_behind)))
except CalledProcessError as e: except CalledProcessError as e:
logging.error('Error executing git command : %s' % str(e)) logging.error('Error executing git command : %s', e)
except FileNotFoundError as e: except FileNotFoundError as e:
logging.error('Repo not found at path %s' % logging.error('Repo not found at path %s' %
repos_conf[repo_code]['path']) repos_conf[repo_code]['path'])
@ -225,7 +223,7 @@ def do_update_repos():
logging.info('Fetching repo %s' % repo_code) logging.info('Fetching repo %s' % repo_code)
execute_git_command(repos_conf[repo_code], ['fetch']) execute_git_command(repos_conf[repo_code], ['fetch'])
except CalledProcessError as e: except CalledProcessError as e:
logging.error('Error executing git command : %s' % str(e)) logging.error('Error executing git command : %s', e)
except FileNotFoundError as e: except FileNotFoundError as e:
logging.error('Repo not found at path %s' % logging.error('Repo not found at path %s' %
repos_conf[repo_code]['path']) repos_conf[repo_code]['path'])
@ -252,7 +250,7 @@ if len(sys.argv) > 1:
elif action == 'update': elif action == 'update':
check_update_repos() check_update_repos()
elif action: elif action:
logging.warn('Unknown argument \'%s\'' % action) logging.warn("Unknown argument '%s'" % action)
sys.exit(1) sys.exit(1)
else: else:
get_info() get_info()