Mod statis modify (bfenetworks#107)

yylover · Nov 20, 2019 · ef7e9e3 · ef7e9e3
1 parent a228bcf
commit ef7e9e3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 3 deletions.
diff --git a/bfe_modules/mod_static/mod_static.go b/bfe_modules/mod_static/mod_static.go
@@ -112,6 +112,24 @@ func (m *ModuleStatic) loadConfData(query url.Values) error {
 	return nil
 }
 
+func (m *ModuleStatic) getState(params map[string][]string) ([]byte, error) {
+	s := m.metrics.GetAll()
+	return s.Format(params)
+}
+
+func (m *ModuleStatic) getStateDiff(params map[string][]string) ([]byte, error) {
+	s := m.metrics.GetDiff()
+	return s.Format(params)
+}
+
+func (m *ModuleStatic) monitorHandlers() map[string]interface{} {
+	handlers := map[string]interface{}{
+		m.name:           m.getState,
+		m.name + ".diff": m.getStateDiff,
+	}
+	return handlers
+}
+
 func errorStatusCode(err error) int {
 	if os.IsNotExist(err) {
 		return bfe_http.StatusNotFound
@@ -169,6 +187,7 @@ func (m *ModuleStatic) createRespFromStaticFile(req *bfe_basic.Request,
 		return resp
 	}
 	if fileInfo.IsDir() {
+		file.Close()
 		file, err = m.tryDefaultFile(root, defaultFile)
 		if err != nil {
 			resp.StatusCode = errorStatusCode(err)
@@ -225,6 +244,11 @@ func (m *ModuleStatic) Init(cbs *bfe_module.BfeCallbacks, whs *web_monitor.WebHa
 		return fmt.Errorf("%s.Init(): AddFilter(m.staticFileHandler): %v", m.name, err)
 	}
 
+	err = web_monitor.RegisterHandlers(whs, web_monitor.WEB_HANDLE_MONITOR, m.monitorHandlers())
+	if err != nil {
+		return fmt.Errorf("%s.Init():RegisterHandlers(m.monitorHandlers): %s", m.name, err.Error())
+	}
+
 	err = whs.RegisterHandler(web_monitor.WEB_HANDLE_RELOAD, m.name, m.loadConfData)
 	if err != nil {
 		return fmt.Errorf("%s.Init(): RegisterHandler(m.loadConfData): %v", m.name, err)

diff --git a/bfe_server/reverseproxy.go b/bfe_server/reverseproxy.go
@@ -674,9 +674,10 @@ func (p *ReverseProxy) ServeHTTP(rw bfe_http.ResponseWriter, basicReq *bfe_basic
 
 	// for read next request
 	defer p.setTimeout(bfe_basic.StageEndRequest, basicReq.Connection, req, cluster.TimeoutReadClientAgain())
-	defer res.Body.Close()
 
 response_got:
+	defer res.Body.Close()
+
 	// Callback for HANDLE_READ_BACKEND
 	hl = srv.CallBacks.GetHandlerList(bfe_module.HANDLE_READ_BACKEND)
 	if hl != nil {

diff --git a/conf/mod_static/index.html b/conf/mod_static/index.html
@@ -0,0 +1,7 @@
+<html>
+
+<body>
+    <p>Welcome to BFE!</p>
+</body>
+
+</html>
diff --git a/conf/mod_static/static_rule.data b/conf/mod_static/static_rule.data
@@ -2,11 +2,11 @@
     "Config": {
         "example_product": [
             {
-                "Cond": "req_host_in(\"www.example.org\")",
+                "Cond": "req_host_in(\"example.org\")",
                 "Action": {
                     "Cmd": "BROWSE",
                     "Params": [
-                        "./",
+                        "../conf/mod_static",
                         "index.html"
                     ]
                 }