From: fujinhua Date: Thu, 9 May 2019 01:43:20 +0000 (+0800) Subject: Fix run and stop sh for catalog X-Git-Tag: 1.3.1~6 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F96%2F87296%2F1;p=vfc%2Fnfvo%2Fcatalog.git Fix run and stop sh for catalog Change-Id: Iaacd3767c62c4e5df04beac1c672655015983e68 Issue-ID: VFC-1306 Signed-off-by: fujinhua --- diff --git a/run.sh b/run.sh index 5a19a62f..a4100743 100755 --- a/run.sh +++ b/run.sh @@ -15,7 +15,7 @@ logDir="/var/log/onap/vfc/catalog/" if [ ! -x $logDir ]; then - mkdir -p $logDir + mkdir -p $logDir fi # nohup python manage.py runserver 0.0.0.0:8806 > /dev/null & @@ -27,10 +27,3 @@ if [ "${SSL_ENABLED}" = "true" ]; then else nohup uwsgi --http :8806 -t 120 --module catalog.wsgi --master --processes 4 & fi - - -while [ ! -f $logDir/runtime_catalog.log ]; do - sleep 1 -done - -tail -F $logDir/runtime_catalog.log \ No newline at end of file diff --git a/stop.sh b/stop.sh index e5335603..f939ce55 100755 --- a/stop.sh +++ b/stop.sh @@ -13,5 +13,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -# ps auxww | grep "manage.py runserver 0.0.0.0:8806" | awk '{print $2}' | xargs kill -9 +# ps auxww | grep "manage.py runserver 0.0.0.0:8806" | awk '{print $1}' | xargs kill -9 ps auxww |grep 'uwsgi --http' |awk '{print $1}' |xargs kill -9