aboutsummaryrefslogtreecommitdiffstats
path: root/teamspeak-multi.py
diff options
context:
space:
mode:
authornico <nico@magicbroccoli.de>2018-10-19 00:59:17 +0200
committernico <nico@magicbroccoli.de>2018-10-19 00:59:17 +0200
commit78f5c7d6756b23d30029c6a1a2cf39d202a00f36 (patch)
treec189d78928338fed87950c2a812da500c39852bc /teamspeak-multi.py
parent9bc4c065d7c29855e5572b8523d384b86edf0c3f (diff)
optimizations and reduction of code clutter
- removed unnecessary try statements * change os.environ to use os.environ.get - removed auth variable * optimized main
Diffstat (limited to 'teamspeak-multi.py')
-rwxr-xr-xteamspeak-multi.py35
1 files changed, 12 insertions, 23 deletions
diff --git a/teamspeak-multi.py b/teamspeak-multi.py
index 2fd092c..1cd0b5d 100755
--- a/teamspeak-multi.py
+++ b/teamspeak-multi.py
@@ -126,20 +126,14 @@ class TeamspeakMulti:
def run(self):
# read the configuration from munin environment
- try:
- server = (os.environ['host'], os.environ['port'])
- except KeyError:
- # if connection variables are not set use default
- server = ('localhost', 10011)
-
- auth = (os.environ['username'], os.environ['password'])
+ server = (os.environ.get('host', "localhost"), os.environ.get('port', 10011))
with ts3.query.TS3Connection(server[0], server[1]) as ts3conn:
# will raise a TS3QueryError if response code is not 0
try:
ts3conn.login(
- client_login_name=auth[0],
- client_login_password=auth[1],
+ client_login_name=os.environ['username'],
+ client_login_password=os.environ['password'],
)
except ts3.query.TS3QueryError as err:
print("Login failed:", err.resp.error["msg"])
@@ -153,22 +147,17 @@ class TeamspeakMulti:
print('\n'.join(result[key]))
def main(self):
- if (sys.argv.__len__() == 2) and (sys.argv[1] == "config"):
- for key in self.config().keys():
- print('\n'.join(self.config()[key]))
- try:
- if os.environ['MUNIN_CAP_DIRTYCONFIG'] == '1':
+ if sys.argv.__len__() == 2:
+ if sys.argv[1] == "config":
+ for key in self.config().keys():
+ print('\n'.join(self.config()[key]))
+ if os.environ.get('MUNIN_CAP_DIRTYCONFIG') == '1':
self.run()
- except KeyError:
- pass
-
- elif (sys.argv.__len__() == 2) and (sys.argv[1] == 'autoconf'):
- # check host if env variables are set
- try:
- if None not in {os.environ['username'], os.environ['password']}:
+ elif sys.argv[1] == 'autoconf':
+ if None not in {os.environ.get('username'), os.environ.get('password')}:
print('yes')
- except KeyError:
- print('no env configuration options are missing')
+ else:
+ print('no env configuration options are missing')
else:
self.run()