changeset 358:f147b778511a

core: local_dir can now be overrided (usefull to launch 2 instances at the same time)
author Goffi <goffi@goffi.org>
date Mon, 06 Jun 2011 18:34:40 +0200
parents d98b7391d76c
children eb9d33ba4e36
files src/core/sat_main.py src/sat.sh
diffstat 2 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/sat_main.py	Sat Jun 04 19:11:38 2011 +0200
+++ b/src/core/sat_main.py	Mon Jun 06 18:34:40 2011 +0200
@@ -75,6 +75,13 @@
 
     def get_const(self, name):
         """Return a constant"""
+        try:
+            _const = os.environ['SAT_CONST_%s' % name]
+            if _const:
+                debug(_("Constant %(name)s overrided with [%(value)s]") % {'name':name, 'value': _const})
+                return _const
+        except KeyError:
+            pass
         if not CONST.has_key(name):
             error(_('Trying to access an undefined constant'))
             raise Exception
--- a/src/sat.sh	Sat Jun 04 19:11:38 2011 +0200
+++ b/src/sat.sh	Mon Jun 06 18:34:40 2011 +0200
@@ -16,8 +16,14 @@
 
 NAME='sat'
 
-PID_FILE="/tmp/$NAME.pid"
-LOG_FILE=~/".$NAME/$NAME.log"
+if [ -n "$SAT_CONST_local_dir" ];then
+	echo "Using overidded local dir: $SAT_CONST_local_dir"
+	PID_FILE="$SAT_CONST_local_dir/$NAME.pid"
+	LOG_FILE="$SAT_CONST_local_dir/$NAME.log"
+else
+	PID_FILE="/tmp/$NAME.pid"
+	LOG_FILE=~/".$NAME/$NAME.log"
+fi
 DAEMON="n"
 MAIN_OPTIONS="-${DAEMON}oy"
 TAP_PATH="./"