From 963931e04d44a5b40d38817163f52f56241a9f33 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Mon, 11 Dec 2017 11:09:35 +0100 Subject: Standardized XDS config file name and location. - config file name is : server-config.json - xds-server settings under user's home is: $HOME/.xds/server - xds-server settings under etc is: /etc/xds/server Signed-off-by: Sebastien Douheret --- scripts/xds-server-start.sh | 27 -------------------------- scripts/xds-server-stop.sh | 36 ----------------------------------- scripts/xds-utils/xds-server-start.sh | 27 ++++++++++++++++++++++++++ scripts/xds-utils/xds-server-stop.sh | 36 +++++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 63 deletions(-) delete mode 100755 scripts/xds-server-start.sh delete mode 100755 scripts/xds-server-stop.sh create mode 100755 scripts/xds-utils/xds-server-start.sh create mode 100755 scripts/xds-utils/xds-server-stop.sh (limited to 'scripts') diff --git a/scripts/xds-server-start.sh b/scripts/xds-server-start.sh deleted file mode 100755 index 90ef68d..0000000 --- a/scripts/xds-server-start.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - ########################################################################### -# Copyright 2017 IoT.bzh -# -# author: Sebastien Douheret -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -########################################################################### - -BINDIR=/opt/AGL/bin -[[ -f $BINDIR/xds-server ]] || BINDIR=$(which xds-server) -[[ -f $BINDIR/xds-server ]] || BINDIR=/usr/local/bin ;# for backward compat -[[ -f $BINDIR/xds-server ]] || { echo "Cannot find xds-server executable !"; exit 1; } - -echo "### Start XDS server" -nohup $BINDIR/xds-server $* & -exit $? diff --git a/scripts/xds-server-stop.sh b/scripts/xds-server-stop.sh deleted file mode 100755 index c534e8f..0000000 --- a/scripts/xds-server-stop.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - ########################################################################### -# Copyright 2017 IoT.bzh -# -# author: Sebastien Douheret -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -########################################################################### - -# Stop it gracefully -pkill -INT xds-server -sleep 1 - -# Seems no stopped, nasty kill -nbProc=$(ps -ef |grep xds-server |grep -v grep |wc -l) -if [ "$nbProc" != "0" ]; then - pkill -KILL xds-server -fi - -nbProc=$(ps -ef |grep syncthing |grep -v grep |wc -l) -if [ "$nbProc" != "0" ]; then - pkill -KILL syncthing - pkill -KILL syncthing-inotify -fi - -exit 0 diff --git a/scripts/xds-utils/xds-server-start.sh b/scripts/xds-utils/xds-server-start.sh new file mode 100755 index 0000000..90ef68d --- /dev/null +++ b/scripts/xds-utils/xds-server-start.sh @@ -0,0 +1,27 @@ +#!/bin/bash + ########################################################################### +# Copyright 2017 IoT.bzh +# +# author: Sebastien Douheret +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +BINDIR=/opt/AGL/bin +[[ -f $BINDIR/xds-server ]] || BINDIR=$(which xds-server) +[[ -f $BINDIR/xds-server ]] || BINDIR=/usr/local/bin ;# for backward compat +[[ -f $BINDIR/xds-server ]] || { echo "Cannot find xds-server executable !"; exit 1; } + +echo "### Start XDS server" +nohup $BINDIR/xds-server $* & +exit $? diff --git a/scripts/xds-utils/xds-server-stop.sh b/scripts/xds-utils/xds-server-stop.sh new file mode 100755 index 0000000..c534e8f --- /dev/null +++ b/scripts/xds-utils/xds-server-stop.sh @@ -0,0 +1,36 @@ +#!/bin/bash + ########################################################################### +# Copyright 2017 IoT.bzh +# +# author: Sebastien Douheret +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +# Stop it gracefully +pkill -INT xds-server +sleep 1 + +# Seems no stopped, nasty kill +nbProc=$(ps -ef |grep xds-server |grep -v grep |wc -l) +if [ "$nbProc" != "0" ]; then + pkill -KILL xds-server +fi + +nbProc=$(ps -ef |grep syncthing |grep -v grep |wc -l) +if [ "$nbProc" != "0" ]; then + pkill -KILL syncthing + pkill -KILL syncthing-inotify +fi + +exit 0 -- cgit 1.2.3-korg