kill in stop script
This commit is contained in:
parent
1e984c2b2e
commit
c0df1a1aed
@ -20,8 +20,6 @@ var Log = null
|
||||
var Helper = null;
|
||||
var Conf = null;
|
||||
|
||||
var Child = null;
|
||||
|
||||
|
||||
exports.init = function(Express, Configuration) {
|
||||
App = Express;
|
||||
@ -70,18 +68,7 @@ exports.play = function(idx) {
|
||||
download.on('end', function(output) {
|
||||
Log.inspect('Radio: Download completed', output);
|
||||
|
||||
if(Helper.isDefinedAndNotNull(Child)) {
|
||||
// kill active instances
|
||||
try {
|
||||
Child.kill();
|
||||
} catch(err) {
|
||||
Log.error('Radio: Error killing process');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Child.stdin.pause();
|
||||
Child.kill();
|
||||
Helper.shspawn(App.get('tools_root')+'action.sh stop');
|
||||
Helper.shspawn(App.get('tools_root')+'action.sh play');
|
||||
});
|
||||
|
||||
|
||||
@ -10,9 +10,10 @@ MY_PATH="$(pwd)"
|
||||
|
||||
### PRORGAM
|
||||
|
||||
echo "Action: $1"
|
||||
#echo "Action: $1"
|
||||
|
||||
case $1 in
|
||||
"play") sh $MY_PATH/bin/start_radio.sh ;;
|
||||
"stop") sh $MY_PATH/bin/stop_radio.sh ;;
|
||||
*) echo "INVALID ACTION!" ;;
|
||||
esac
|
||||
@ -13,3 +13,5 @@ MY_PATH="$(pwd)"
|
||||
echo
|
||||
echo "${BGre}Stop playing ...${RCol}"
|
||||
echo
|
||||
|
||||
pkill -f mplayer
|
||||
Loading…
x
Reference in New Issue
Block a user