aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryalei wang <wylandrea@gmail.com>2018-08-01 08:49:26 +0000
committerGerrit Code Review <gerrit@fd.io>2018-08-01 08:49:26 +0000
commitf168f527bb9587ec398a2fd3d98615188b0dfab1 (patch)
treea81954bf95ed2dfa8c112bfd66b2cfed975169b4
parent0460a273eadbe35144c71ca131de32307a4dbb82 (diff)
parented9cc5579ac9b017bd03472effe12a5625e03918 (diff)
Merge "Fix: change the log dir and update the log flush time"
-rw-r--r--doc/DMM_DeveloperManual.md2
-rwxr-xr-xscripts/build.sh2
-rw-r--r--src/framework/include/nsfw_mgr_com_api.h2
-rw-r--r--src/framework/include/nstack_log.h4
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/DMM_DeveloperManual.md b/doc/DMM_DeveloperManual.md
index 22fba2b..99f23fd 100644
--- a/doc/DMM_DeveloperManual.md
+++ b/doc/DMM_DeveloperManual.md
@@ -1000,7 +1000,7 @@ stack itself. The standard socket APIs defined by DMM are as follows:
**6. Log & Debug**<br>
============================
nStack uses GLOG framework to provide multi level logs. Supported log levels are debug, info,
-warning, error and emergency. Logs will be stored at /product/gpaas/log/nStack. To enable log,
+warning, error and emergency. Logs will be stored at /var/log/nStack/. To enable log,
need to set the environment variables NSTACK\_LOG\_ON
```
export NSTACK_LOG_ON=DBG
diff --git a/scripts/build.sh b/scripts/build.sh
index d412956..7726f94 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -191,7 +191,7 @@ if [ "$hugepagesize" == "2048" ]; then
elif [ "$hugepagesize" == "1048576" ]; then
sudo mount -t hugetlbfs -o pagesize=1G none /mnt/nstackhuge/
fi
-sudo mkdir -p /var/run/ip_module/
+#sudo mkdir -p /var/run/ip_module/
#disable ASLR, othewise it may have some problems when mapping memory for secondary process
echo 0 > /proc/sys/kernel/randomize_va_space
diff --git a/src/framework/include/nsfw_mgr_com_api.h b/src/framework/include/nsfw_mgr_com_api.h
index dcb602c..45102bb 100644
--- a/src/framework/include/nsfw_mgr_com_api.h
+++ b/src/framework/include/nsfw_mgr_com_api.h
@@ -107,7 +107,7 @@ typedef enum _fw_poc_type
NSFW_PROC_MAX = 16
} fw_poc_type;
-#define NSFW_DOMAIN_DIR "/var/run/"
+#define NSFW_DOMAIN_DIR "/var/log/nStack/"
#define NSTACK_MAX_PROC_NAME_LEN 20
typedef enum _nsfw_mgr_msg_rsp_code
diff --git a/src/framework/include/nstack_log.h b/src/framework/include/nstack_log.h
index 67e5b29..ec5dac6 100644
--- a/src/framework/include/nstack_log.h
+++ b/src/framework/include/nstack_log.h
@@ -106,7 +106,7 @@ enum _LOG_PROCESS
#define GET_FILE_NAME(name_have_path) strrchr(name_have_path,'/')?strrchr(name_have_path,'/')+1:name_have_path
-#define NSTACK_LOG_NAME "/product/gpaas/log/nStack"
+#define NSTACK_LOG_NAME "/var/log/nStack/"
#define STACKX_LOG_NAME "running.log"
@@ -118,7 +118,7 @@ enum _LOG_PROCESS
#define FAILURE_LOG_NAME "fail_dump.log"
-#define FLUSH_TIME 30
+#define FLUSH_TIME 10
#define APP_LOG_SIZE 30
#define APP_LOG_COUNT 10