From 5efd6c0b11ce5b0ab3ec5975bfe6125af7eb6ea4 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 25 Apr 2014 12:52:05 +0200 Subject: reaktor getconf: allow default_value --- Reaktor/IRC/getconf.py | 7 +++++-- Reaktor/IRC/ircasy.py | 5 +---- Reaktor/IRC/reaktor.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'Reaktor/IRC') diff --git a/Reaktor/IRC/getconf.py b/Reaktor/IRC/getconf.py index f9cd4404..168c908c 100644 --- a/Reaktor/IRC/getconf.py +++ b/Reaktor/IRC/getconf.py @@ -9,14 +9,17 @@ import os def make_getconf(filename): - def getconf(prop): + def getconf(prop, default_value=None): prop_split = prop.split('.') string = '' config = load_config(filename) #imp.reload(config) tmp = config.__dict__ for pr in prop_split: - tmp = tmp[pr] + if pr in tmp: + tmp = tmp[pr] + else: + return default_value return tmp return getconf diff --git a/Reaktor/IRC/ircasy.py b/Reaktor/IRC/ircasy.py index 259ea98c..9a7f44f3 100644 --- a/Reaktor/IRC/ircasy.py +++ b/Reaktor/IRC/ircasy.py @@ -114,10 +114,7 @@ class asybot(asychat): self.on_kick(prefix, command, params, rest) elif command == 'JOIN': - try: - self.on_join(prefix, command, params, rest) - except: - pass + self.on_join(prefix, command, params, rest) elif command == '433': # ERR_NICKNAMEINUSE, retry with another name diff --git a/Reaktor/IRC/reaktor.py b/Reaktor/IRC/reaktor.py index b53ef651..54091c5d 100755 --- a/Reaktor/IRC/reaktor.py +++ b/Reaktor/IRC/reaktor.py @@ -36,7 +36,7 @@ class Reaktor(asybot): return False def on_join(self, prefix, command, params, rest): - for command in getconf('on_join'): + for command in getconf('on_join', []): self.execute_command(command, None, prefix, params) def on_privmsg(self, prefix, command, params, rest): -- cgit v1.2.3 From 7bf0b790b95d97d33e57a4e52cf7681bc6366d98 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 25 Apr 2014 13:34:04 +0200 Subject: reaktor: move config_filename to config --- Reaktor/IRC/reaktor.py | 1 - 1 file changed, 1 deletion(-) (limited to 'Reaktor/IRC') diff --git a/Reaktor/IRC/reaktor.py b/Reaktor/IRC/reaktor.py index 54091c5d..bfd08d9f 100755 --- a/Reaktor/IRC/reaktor.py +++ b/Reaktor/IRC/reaktor.py @@ -81,7 +81,6 @@ class Reaktor(asybot): target.append(env['_from']) log.debug('target:' +str(target)) - env['config_filename'] = os.path.abspath(self.config) start = time() try: p = popen(myargv, bufsize=1, stdout=PIPE, stderr=PIPE, env=env, cwd=cwd) -- cgit v1.2.3 From 6df0fa8c961dd9884826488986892db3b2574ce8 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 25 Apr 2014 15:22:51 +0200 Subject: add fallback for non existing directory --- Reaktor/IRC/reaktor.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Reaktor/IRC') diff --git a/Reaktor/IRC/reaktor.py b/Reaktor/IRC/reaktor.py index bfd08d9f..ec306e7c 100755 --- a/Reaktor/IRC/reaktor.py +++ b/Reaktor/IRC/reaktor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os from ircasy import asybot from asyncore import loop @@ -69,6 +69,9 @@ class Reaktor(asybot): log.info("cannot parse args!") cwd = getconf('workdir') + if not os.access(cwd,os.W_OK): + log.error("Workdir '%s' is not Writable! Falling back to root dir"%cwd) + cwd = "/" env = command.get('env', {}) env['_prefix'] = prefix -- cgit v1.2.3