解决非root用户执行报错问题

mzky · Sep 4, 2019 · a29ce2c · a29ce2c
1 parent c4239fc
commit a29ce2c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/easyNmon b/easyNmon
diff --git a/internal/lazy.go b/internal/lazy.go
@@ -31,6 +31,8 @@ type NmonReport struct {
 func GenIndexPage(nr *NmonReport, fPath string) {
 	tpl := template.Must(template.New("data.tpl").ParseFiles(filepath.Join("web", "chart", "data.tpl")))
 	file, err := os.Create(filepath.Join(fPath, "data.json"))
+	os.Chmod(filepath.Join(fPath, "data.json"), os.ModePerm)
+
 	if err != nil {
 		log.Println(err)
 	}

diff --git a/main/easyNmon.go b/main/easyNmon.go
@@ -48,7 +48,8 @@ func main() {
 
 	ReportDir = *dir
 	NmonPath = *nmonpath
-	err := os.MkdirAll(ReportDir, 755)
+	syscall.Umask(0)
+	err := os.MkdirAll(ReportDir, os.ModePerm)
 	if err != nil {
 		fmt.Println("easyNmon启动权限不足!")
 		return
@@ -132,7 +133,7 @@ func start(c *gin.Context) { // 格式 ?n=name&t=time&f=60 参数均可为空
 	}
 	go func() {
 		fp := filepath.Join(ReportDir, fileName)
-		os.MkdirAll(fp, 777)
+		os.MkdirAll(fp, os.ModePerm)
 
 		buf, err := ioutil.ReadFile("web/chart/index.html")
 		if err != nil {
@@ -147,6 +148,10 @@ func start(c *gin.Context) { // 格式 ?n=name&t=time&f=60 参数均可为空
 		exec.Command("cp", "-f", "web/js/echarts.min.js", fp).Run()
 		//	exec.Command("cp", "-f", "web/chart/index.html", fp).Run()
 		exec.Command("/bin/bash", "-c", strings.Join([]string{NmonPath, "-f -t -s", frequency, "-c", strconv.Itoa(t * 60 / f), "-m", fp, "-F", name}, " ")).Run()
+		os.Chmod(filepath.Join(fp, "index.html"), os.ModePerm)
+		os.Chmod(filepath.Join(fp, "echarts.min.js"), os.ModePerm)
+		os.Chmod(filepath.Join(fp, name), os.ModePerm)
+
 		time.Sleep(time.Second * 2)
 		internal.GetNmonReport(fp, name)
 		time.Sleep(time.Second * time.Duration(t*60+2))

diff --git a/web/chart/index.html b/web/chart/index.html
@@ -568,7 +568,7 @@
                 });
             }
             ajaxGet();
-            setInterval(ajaxGet, 1000);
+	    setInterval(ajaxGet, {{loopTime}});
         </script>
     </body>
 </html>
diff --git a/web/index.html b/web/index.html
@@ -50,7 +50,7 @@
                                             监控频率 </label>
                                         <div class="am-u-sm-7">
                                             <input type="text" class="am-form-field tpl-form-no-bg" id="frequency"
-                                                placeholder="输入监控频率">
+                                                placeholder="输入监控频率" value="30">
                                             <small>单位为秒，推荐设置30秒以上</small>
                                         </div>