Merge pull request #739 from lei-cao/develop

Added the UI for Admin monitor page

@@ -11,7 +11,6 @@ package toolbox
 
 
 import (
 import (
 	"fmt"
 	"fmt"
-	"io"
 	"sync"
 	"sync"
 	"time"
 	"time"
 )
 )
@@ -79,17 +78,28 @@ func (m *UrlMap) AddStatistics(requestMethod, requestUrl, requestController stri
 }
 }
 
 
 // put url statistics result in io.Writer
 // put url statistics result in io.Writer
-func (m *UrlMap) GetMap(rw io.Writer) {
+func (m *UrlMap) GetMap() [][]string {
 	m.lock.RLock()
 	m.lock.RLock()
 	defer m.lock.RUnlock()
 	defer m.lock.RUnlock()
-	fmt.Fprintf(rw, "| % -50s| % -10s | % -16s | % -16s | % -16s | % -16s | % -16s |\n", "requestUrl", "method", "times", "used", "max used", "min used", "avg used")
+	resultLists := make([][]string, 0)
+
+	var result = []string{"requestUrl", "method", "times", "used", "max used", "min used", "avg used"}
+	resultLists = append(resultLists, result)
 	for k, v := range m.urlmap {
 	for k, v := range m.urlmap {
 		for kk, vv := range v {
 		for kk, vv := range v {
-			fmt.Fprintf(rw, "| % -50s| % -10s | % -16d | % -16s | % -16s | % -16s | % -16s |\n", k,
-				kk, vv.RequestNum, toS(vv.TotalTime), toS(vv.MaxTime), toS(vv.MinTime), toS(time.Duration(int64(vv.TotalTime)/vv.RequestNum)),
-			)
+			result := []string{
+				fmt.Sprintf("% -50s", k),
+				fmt.Sprintf("% -10s", kk),
+				fmt.Sprintf("% -16d", vv.RequestNum),
+				fmt.Sprintf("% -16s", toS(vv.TotalTime)),
+				fmt.Sprintf("% -16s", toS(vv.MaxTime)),
+				fmt.Sprintf("% -16s", toS(vv.MinTime)),
+				fmt.Sprintf("% -16s", toS(time.Duration(int64(vv.TotalTime)/vv.RequestNum))),
+			}
+			resultLists = append(resultLists, result)
 		}
 		}
 	}
 	}
+	return resultLists
 }
 }
 
 
 // global statistics data map
 // global statistics data map