Merge pull request #65 from webability-go/late-night

patch v1.5.5

Author: metalwolf

README.md

@@ -461,10 +461,11 @@ The stat function is a public function from any of your loaded plugins.
 The general syntax is:
 
 ```
-import "github.com/webability-go/xamboo/cms/context"
+import "github.com/webability-go/xamboo/components/host"
 
-func Log(ctx *context.Context) {
+func Log(hw *host.HostWriter) {
 	// do the log
+  // The RequestStat and the Context objects are into the HostWriter parameters
 }
 ```
 
@@ -1415,6 +1416,15 @@ Extras:
 
 # Version Changes Control
 
+v1.5.5 - 2021-03-08
+-----------------------
+- Change of logstat function definition, for log:stat:call:app:logstat it is now func(host.HostWriter).
+- The stat component sets the RequestStat en the HostWriter params.
+- The cms component sets the Context en the HostWriter params.
+- The HostWriter should contain the requeststat and the context object in the parameters, if needed.
+- The loggers Hook function is now an interface{} that should be a func(host.HostWriter) compatible function.
+- Reference manual (this document) modified to meet the changes.
+
 v1.5.4 - 2021-03-08
 -----------------------
 - deflate encoder implemented into compress component

applications/linker.go

@@ -1,16 +1,15 @@
 package applications
 
 import (
-	//	"fmt"
 	"os"
 	"plugin"
 	"strings"
 	"sync"
 
 	"github.com/webability-go/xcore/v2"
 
-	"github.com/webability-go/xamboo/cms/context"
 	"github.com/webability-go/xamboo/compiler"
+	"github.com/webability-go/xamboo/components/host"
 	"github.com/webability-go/xamboo/config"
 	"github.com/webability-go/xamboo/loggers"
 	"github.com/webability-go/xamboo/utils"
@@ -146,23 +145,23 @@ func LinkCalls() {
 	xlogger := loggers.GetCoreLogger("sys")
 	xlogger.Println("Build Applications External")
 	xloggererror := loggers.GetCoreLogger("errors")
-	for _, host := range config.Config.Hosts {
+	for _, cfhost := range config.Config.Hosts {
 
-		if len(host.Log.Stats) > 6 {
-			logdata := strings.Split(host.Log.Stats, ":")
+		if len(cfhost.Log.Stats) > 6 {
+			logdata := strings.Split(cfhost.Log.Stats, ":")
 			if len(logdata) == 3 && logdata[0] == "call" {
-				lib := GetApplicationPlugin(host.Name + "|" + logdata[1])
+				lib := GetApplicationPlugin(cfhost.Name + "|" + logdata[1])
 				if lib == nil {
-					xloggererror.Println("Error, the host application to call in the stat log does not exists: " + host.Log.Stats)
+					xloggererror.Println("Error, the host application to call in the stat log does not exists: " + cfhost.Log.Stats)
 					continue
 				}
 				ihook, err := lib.Lookup(logdata[2])
-				hook, ok := ihook.(func(*context.Context))
+				hook, ok := ihook.(func(host.HostWriter))
 				if err != nil || !ok {
 					xloggererror.Println("Failed to find stat call function:", logdata[1], logdata[2], err)
 					continue
 				}
-				loggers.SetHostHook(host.Name, "stats", hook)
+				loggers.SetHostHook(cfhost.Name, "stats", hook)
 			}
 		}
 	}

cms/cms.go

@@ -21,7 +21,7 @@ import (
 	"github.com/webability-go/xamboo/cms/engines/assets"
 	"github.com/webability-go/xamboo/cms/identity"
 	"github.com/webability-go/xamboo/components/host"
-	"github.com/webability-go/xamboo/components/stat"
+	//	"github.com/webability-go/xamboo/components/stat"
 )
 
 func Start() {
@@ -200,16 +200,7 @@ func (s *CMS) Run(page string, innerpage bool, params interface{}, version strin
 	}
 	// Assign the context to the statwriter parameters if it exists and is a correct RequestStat
 	hw := s.writer.(host.HostWriter)
-	p := hw.GetParams()
-	if p != nil {
-		ireq, _ := p.Get("RequestStat")
-		if ireq != nil {
-			req, ok := ireq.(*stat.RequestStat)
-			if ok {
-				req.Context = ctx
-			}
-		}
-	}
+	hw.SetParam("context", ctx)
 
 	// 1. Build-in engines
 	var xdata string

components/log/log.go

@@ -47,38 +47,44 @@ func (log *Log) Handler(handler http.HandlerFunc) http.HandlerFunc {
 			http.Error(w, "C[log]: Writer error (see logs for more info)", http.StatusInternalServerError)
 			return
 		}
-		host := hw.GetHost()
-		if host == nil {
+		hwhost := hw.GetHost()
+		if hwhost == nil {
 			slg.Println("C[log]: Critical error: there is no HOST in the host writer (and that should not happen)", r, w)
 			http.Error(w, "C[log]: Writer error (see logs for more info)", http.StatusInternalServerError)
 			return
 		}
 
-		lg := loggers.GetHostLogger(host.Name, "sys")
-		if host.Debug {
+		lg := loggers.GetHostLogger(hwhost.Name, "sys")
+		if hwhost.Debug {
 			lg.Println("C[log]: We are going to serve the handler.")
 		}
 
 		handler.ServeHTTP(w, r)
 
-		if host.Debug {
-			lg.Println("C[log]: We have served the handler, log enabled:", host.Log.Enabled)
+		if hwhost.Debug {
+			lg.Println("C[log]: We have served the handler, log enabled:", hwhost.Log.Enabled)
 		}
-		if host.Log.Enabled {
+		if hwhost.Log.Enabled {
 			// Read the PARAMS
 			// Read the loggers
 			// Log the data
 			p := hw.GetParams()
-			ireq, _ := p.Get("RequestStat")
-			req := ireq.(*stat.RequestStat)
-
-			hlogger := loggers.GetHostLogger(req.Hostname, "pages")
-			if hlogger != nil {
-				hlogger.Println(BuildLogLine(host.Log.PagesFormat, buildLogParams(hw)))
-			}
-			slogger := loggers.GetHostHook(req.Hostname, "stats")
-			if slogger != nil && req.Context != nil {
-				slogger(req.Context)
+			ireq, _ := p.Get("requeststat")
+			if ireq != nil {
+				req, ok := ireq.(*stat.RequestStat)
+				if ok {
+					hlogger := loggers.GetHostLogger(req.Hostname, "pages")
+					if hlogger != nil {
+						hlogger.Println(BuildLogLine(hwhost.Log.PagesFormat, buildLogParams(hw)))
+					}
+					islogger := loggers.GetHostHook(req.Hostname, "stats")
+					if islogger != nil {
+						slogger, ok := islogger.(func(host.HostWriter))
+						if ok {
+							slogger(hw)
+						}
+					}
+				}
 			}
 		}
 	}
@@ -94,7 +100,10 @@ func buildLogParams(hw host.HostWriter) map[string]string {
 	params := hw.GetParams()
 
 	for id, p := range params.Parameters {
-		if id == "RequestStat" {
+		if id == "context" {
+			continue
+		}
+		if id == "requeststat" {
 			if p.Value != nil {
 				req, ok := p.Value.(*stat.RequestStat)
 				if ok {

components/stat/request.go

@@ -7,8 +7,7 @@ import (
 
 	"github.com/webability-go/xamboo/config"
 	"github.com/webability-go/xamboo/loggers"
-
-	"github.com/webability-go/xamboo/cms/context"
+	//	"github.com/webability-go/xamboo/cms/context"
 )
 
 /*
@@ -29,7 +28,6 @@ type RequestStat struct {
 	IP        string
 	Port      string
 	Alive     bool
-	Context   *context.Context `json:"-"`
 }
 
 type SiteStat struct {

components/stat/stat.go

@@ -49,7 +49,7 @@ func (st *Stat) Handler(handler http.HandlerFunc) http.HandlerFunc {
 		req := CreateRequestStat(r.Host+r.URL.Path, r.Method, r.Proto, 0, 0, 0, r.RemoteAddr)
 		req.Hostname = host.Name
 		sw := writer{writer: hw, RequestStat: req}
-		hw.SetParam("RequestStat", req)
+		hw.SetParam("requeststat", req)
 
 		if host.Debug {
 			lg.Println("C[stat]: statwriter created, we are going to serve the handler.")
@@ -64,6 +64,6 @@ func (st *Stat) Handler(handler http.HandlerFunc) http.HandlerFunc {
 		req.UpdateStat(sw.status, sw.length)
 		req.End()
 		// Send the final stats data to the Params of hostwriter
-		hw.SetParam("RequestStat", req)
+		hw.SetParam("requeststat", req)
 	}
 }

loggers/loggers.go

@@ -1,22 +1,20 @@
 package loggers
 
 import (
-	//	"fmt"
 	"io"
 	"io/ioutil"
 	"log"
 	"os"
 	"strings"
 
-	"github.com/webability-go/xamboo/cms/context"
 	"github.com/webability-go/xamboo/config"
 )
 
 type Logger struct {
 	TypeOfLogger string
 	File         string
 	Logger       *log.Logger
-	Hook         func(*context.Context)
+	Hook         interface{}
 }
 
 var Loggers = map[string]*Logger{}
@@ -129,11 +127,11 @@ func GetHostLogger(id string, cat string) *log.Logger {
 	return Loggers["H["+id+"]["+cat+"]"].Logger
 }
 
-func GetHostHook(id string, cat string) func(*context.Context) {
+func GetHostHook(id string, cat string) interface{} {
 	return Loggers["H["+id+"]["+cat+"]"].Hook
 }
 
-func SetHostHook(id string, cat string, h func(*context.Context)) {
+func SetHostHook(id string, cat string, h interface{}) {
 	if Loggers["H["+id+"]["+cat+"]"] != nil {
 		Loggers["H["+id+"]["+cat+"]"].Hook = h
 	}

xamboo.go

@@ -26,4 +26,4 @@
 package xamboo
 
 // VERSION last oficial published version of the xamboo on github.com
-const VERSION = "1.5.4"
+const VERSION = "1.5.5"