From: chenjiankun <chenjiankun1@huawei.com>
Date: Wed, 21 Dec 2016 11:14:02 +0000 (+0000)
Subject: Move uwsgi.log and yardstick.sock to proper location
X-Git-Tag: danube.1.0~156^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=refs%2Fchanges%2F31%2F26331%2F1;p=yardstick.git

Move uwsgi.log and yardstick.sock to proper location

JIRA: YARDSTICK-504

Now yardstick.sock and uwsgi.log is in yardstick/api directory.
But it is not standard for they should not be put in the code path.
So I move yardstick.sock to /var/run/yardstick.sock
and move uwsgi.log to /var/log/yardstick/uwsgi.log

Change-Id: I526ab011c0222255dfbae037f494edb5d8a88add
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
---

diff --git a/api/api-prepare.sh b/api/api-prepare.sh
index fade8ccc6..5cc65c959 100755
--- a/api/api-prepare.sh
+++ b/api/api-prepare.sh
@@ -20,7 +20,7 @@ server {
     index  index.htm index.html;
     location / {
         include uwsgi_params;
-        uwsgi_pass unix:///home/opnfv/repos/yardstick/api/yardstick.sock;
+        uwsgi_pass unix:///var/run/yardstick.sock;
     }
 }
 EOF
@@ -47,3 +47,9 @@ command = uwsgi -i yardstick.ini
 autorestart = true
 EOF
 fi
+
+# create api log directory
+mkdir -p /var/log/yardstick
+
+# create yardstick.sock for communicating
+touch /var/run/yardstick.sock
diff --git a/api/yardstick.ini b/api/yardstick.ini
index 01025c2ef..2ba881fc1 100644
--- a/api/yardstick.ini
+++ b/api/yardstick.ini
@@ -12,5 +12,5 @@ chmod-socket = 666
 callable = app
 enable-threads = true
 close-on-exec = 1
-daemonize=/home/opnfv/repos/yardstick/api/uwsgi.log
-socket = /home/opnfv/repos/yardstick/api/yardstick.sock
+daemonize= /var/log/yardstick/uwsgi.log
+socket = /var/run/yardstick.sock
diff --git a/api/yardstick.sock b/api/yardstick.sock
deleted file mode 100644
index e69de29bb..000000000