summaryrefslogtreecommitdiffstats
path: root/standalone
diff options
context:
space:
mode:
authorzhangab <zhanganbing@chinamobile.com>2018-05-23 15:19:22 +0800
committerzhangab <zhanganbing@chinamobile.com>2018-05-23 15:19:28 +0800
commit9898020025e33215e1c395975e42d8a690c57c3b (patch)
tree757821795c0006f77f8cb37a3dbce44a4387d08e /standalone
parentdc2700619b3a2063ce143d8bbee0c3a809947209 (diff)
fix alarm clear information analysis bug
Change-Id: Iafa4a7bd89e231bd0c9c5d0901a0a477d48b8e80 Issue-ID: USECASEUI-119 Signed-off-by: zhangab <zhanganbing@chinamobile.com>
Diffstat (limited to 'standalone')
-rw-r--r--standalone/src/main/assembly/bin/run.sh8
-rw-r--r--standalone/src/main/assembly/resources/bin/initDB.sh8
2 files changed, 3 insertions, 13 deletions
diff --git a/standalone/src/main/assembly/bin/run.sh b/standalone/src/main/assembly/bin/run.sh
index 08d659cf..25a83d59 100644
--- a/standalone/src/main/assembly/bin/run.sh
+++ b/standalone/src/main/assembly/bin/run.sh
@@ -21,15 +21,11 @@ echo @RUNHOME@ $RUNHOME
echo "Starting mysql"
service mysql start
-sleep 10
-echo "run.sh 1"
+sleep 100
SCRIPT="/home/uui/resources/bin/initDB.sh"
-echo "run.sh 2"
chmod 755 $SCRIPT
-echo "run.sh 3"
-$SCRIPT root root 3306 127.0.0.1
-echo "run.sh 4"
+$SCRIPT root root 3306 127.0.0.1
echo @JAVA_HOME@ $JAVA_HOME
JAVA="$JAVA_HOME/bin/java"
diff --git a/standalone/src/main/assembly/resources/bin/initDB.sh b/standalone/src/main/assembly/resources/bin/initDB.sh
index b9504926..06d2bfc8 100644
--- a/standalone/src/main/assembly/resources/bin/initDB.sh
+++ b/standalone/src/main/assembly/resources/bin/initDB.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
#
# Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
#
@@ -15,21 +15,15 @@
# limitations under the License.
#
-echo "initDB.sh 1"
DIRNAME=`dirname $0`
-echo "initDB.sh 2"
HOME=`cd $DIRNAME/; pwd`
-echo "initDB.sh 3"
user=$1
password=$2
port=$3
host=$4
-echo "initDB.sh 4"
echo "start create usecase-ui db"
sql_path=$HOME/../
-echo "initDB.sh 5"
mysql -u$user -p$password -P$port -h$host <$sql_path/dbscripts/mysql/usecase-ui-createdb.sql
-echo "initDB.sh 6"
sql_result=$?
if [ $sql_result != 0 ] ; then
echo "failed to create usecase-ui database"