From f6d414d90389641ca150a20a93faa438d719ca8c Mon Sep 17 00:00:00 2001
From: root <root@jumpserver.(none)>
Date: Wed, 12 Nov 2014 11:00:47 +0800
Subject: [PATCH] fix bug

---
 runserver                | 18 ++++++++++++++++++
 stopserver               |  5 +++++
 webroot/AutoSa/runserver |  5 -----
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100755 runserver
 create mode 100755 stopserver
 delete mode 100755 webroot/AutoSa/runserver

diff --git a/runserver b/runserver
new file mode 100755
index 000000000..62644e442
--- /dev/null
+++ b/runserver
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+manage_file="./webroot/AutoSa/manage.py"
+log_handler_file="./webroot/AutoSa/log_handler.py"
+websocket_file="./webroot/AutoSa/websocket/index.js"
+
+which node &> /dev/null
+if [ $? != '0' ];then
+    echo "Please define the node.js binary file 'node' in the PATH."
+    exit
+fi
+node $websocket_file &
+if [ -f $manage_file -a -e $manage_file ] && [ -f $log_handler_file -a -e $log_handler_file ];then
+    $manage_file runserver 0.0.0.0:80 &> logs/access.log &
+    $log_handler_file &> logs/handler.log   &
+else
+    echo "manage.py or log_handler.py isn't exist or executable."
+fi
diff --git a/stopserver b/stopserver
new file mode 100755
index 000000000..45a1452be
--- /dev/null
+++ b/stopserver
@@ -0,0 +1,5 @@
+#!/bin/bash
+pids=$(ps axu | grep -E '(manage.py|log_handler|index.js)' | grep -v 'grep'  | awk '{ print $2 }')
+for pid in $pids;do
+    kill -15 $pid
+done
diff --git a/webroot/AutoSa/runserver b/webroot/AutoSa/runserver
deleted file mode 100755
index b0a58a2b4..000000000
--- a/webroot/AutoSa/runserver
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-./manage.py runserver 0.0.0.0:80 &> access.log &
-./log_handler.py &> handler.log  &
-node ./websocket/index.js &
\ No newline at end of file