misc: daemon mode refactoring:
- there is no more daemon mode disctinction between local and installed version
- sat is launched as daemon by default, use "sat fg" to launch it foreground
This commit is contained in:
parent
917bbe24b3
commit
218a4122e6
2 changed files with 6 additions and 6 deletions
4
setup.py
4
setup.py
|
|
@ -65,9 +65,7 @@ class CustomInstall(install):
|
|||
run_dir = os.path.dirname(self.sh_script_path)
|
||||
with open(self.sh_script_path, 'r') as sh_file:
|
||||
for ori_line in sh_file:
|
||||
if ori_line.startswith('DAEMON='):
|
||||
dest_line = 'DAEMON=""\n' # we want to launch sat as a daemon
|
||||
elif ori_line.startswith('TAP_PATH='):
|
||||
if ori_line.startswith('TAP_PATH='):
|
||||
dest_line = 'TAP_PATH="%s/"\n' % run_dir
|
||||
elif ori_line.startswith('PYTHON='):
|
||||
dest_line = 'PYTHON="%s"\n' % sys.executable
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
DEBUG=""
|
||||
DAEMON=""
|
||||
PYTHON="python2"
|
||||
|
||||
kill_process() {
|
||||
|
|
@ -59,14 +60,15 @@ if [ $# -eq 1 ];then
|
|||
if [ $1 = "stop" ];then
|
||||
kill_process $PID_FILE "$APP_NAME"
|
||||
exit 0
|
||||
fi
|
||||
if [ $1 = "debug" ];then
|
||||
elif [ $1 = "debug" ];then
|
||||
echo "Launching $APP_NAME in debug mode"
|
||||
DEBUG="--debug"
|
||||
elif [ $1 = "fg" ];then
|
||||
echo "Launching $APP_NAME in foreground mode"
|
||||
DAEMON="n"
|
||||
fi
|
||||
fi
|
||||
|
||||
DAEMON="n"
|
||||
MAIN_OPTIONS="-${DAEMON}oy"
|
||||
TAP_PATH="./"
|
||||
TAP_FILE="$APP_NAME_FILE.tac"
|
||||
|
|
|
|||
Loading…
Reference in a new issue