summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJing Lu <lvjing5@huawei.com>2016-12-24 01:12:49 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-24 01:12:49 +0000
commit734a4d10e3d3efc0ed869771be56b3cbd9df7602 (patch)
tree2e3387ebda2005301549a051606f47e7b7901533
parentca1bb41a5af846e150b8f4d87f336eec05ea21f8 (diff)
parent46858e3970bdbcb3026d85b9a640d3bd7f4cdd9a (diff)
Merge "Move uwsgi.log and yardstick.sock to proper location"
-rwxr-xr-xapi/api-prepare.sh8
-rw-r--r--api/yardstick.ini4
-rw-r--r--api/yardstick.sock0
3 files changed, 9 insertions, 3 deletions
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
--- a/api/yardstick.sock
+++ /dev/null