summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@nomic.retiolum>2014-04-20 12:13:33 +0200
committertv <tv@nomic.retiolum>2014-04-20 12:13:33 +0200
commit01d8f1f70a889519fd181f889e070450b8e62c97 (patch)
treee5a012faf4f4ff98b15e2e66e3dbf0bd7f340016
parentca5d255950524d1e90dd3370b1d42c2cf28124dd (diff)
reaktor.py: set cwd
-rwxr-xr-xReaktor/IRC/reaktor.py4
-rw-r--r--Reaktor/config.py3
2 files changed, 6 insertions, 1 deletions
diff --git a/Reaktor/IRC/reaktor.py b/Reaktor/IRC/reaktor.py
index 830e6a93..b8200398 100755
--- a/Reaktor/IRC/reaktor.py
+++ b/Reaktor/IRC/reaktor.py
@@ -60,6 +60,8 @@ class Reaktor(asybot):
if match.groupdict().get('args',None):
myargv += shlex.split(match.groupdict()['args'])
+ cwd = getconf('workdir')
+
env = {}
env['_prefix'] = prefix
env['_from'] = prefix.split('!', 1)[0]
@@ -74,7 +76,7 @@ class Reaktor(asybot):
env['config_filename'] = os.path.abspath(config_filename)
start = time()
try:
- p = popen(myargv, bufsize=1, stdout=PIPE, stderr=PIPE, env=env)
+ p = popen(myargv, bufsize=1, stdout=PIPE, stderr=PIPE, env=env, cwd=cwd)
except (OSError, Exception) as error:
self.ME(target, 'brain damaged')
log.error('OSError@%s: %s' % (myargv, error))
diff --git a/Reaktor/config.py b/Reaktor/config.py
index 88ae837c..88701379 100644
--- a/Reaktor/config.py
+++ b/Reaktor/config.py
@@ -1,9 +1,12 @@
+from os import environ
debug = True
# CAVEAT name should not contains regex magic
name = 'crabmanner'
+workdir = environ['HOME'] + '/state'
+
irc_alarm_timeout = 300
irc_hammer_interval = 10
irc_kill_timeout = 360