diff --git a/database/admin.go b/database/admin.go index 7dedcd1..6c03979 100644 --- a/database/admin.go +++ b/database/admin.go @@ -6,6 +6,7 @@ import ( "github.com/jackc/pgx/v4/pgxpool" "log" "strconv" + "trikotwaschliste/logbuffer" "trikotwaschliste/models" ) @@ -61,3 +62,7 @@ func ChangeName(pool *pgxpool.Pool, id, personID string) bool { return true } + +func Logs(queue *logbuffer.Queue) gin.H { + return gin.H{"items": queue.ToSlice()} +} \ No newline at end of file diff --git a/handler/admin.go b/handler/admin.go index b6e2ca7..0a972c8 100644 --- a/handler/admin.go +++ b/handler/admin.go @@ -5,6 +5,7 @@ import ( "github.com/jackc/pgx/v4/pgxpool" "net/http" "trikotwaschliste/database" + "trikotwaschliste/logbuffer" ) func AdminMainPage(pool *pgxpool.Pool) gin.HandlerFunc { @@ -22,3 +23,9 @@ func ChangeName(pool *pgxpool.Pool) gin.HandlerFunc { c.Redirect(302, "/admin") } } + +func Logs(queue *logbuffer.Queue) gin.HandlerFunc { + return func(c *gin.Context) { + c.HTML(http.StatusAccepted, "adminlogs.html", database.Logs(queue)) + } +} \ No newline at end of file diff --git a/html/admin/adminlogs.html b/html/admin/adminlogs.html new file mode 100644 index 0000000..8b9fdfe --- /dev/null +++ b/html/admin/adminlogs.html @@ -0,0 +1,34 @@ + + + + + Trikotwaschliste - Admin + + + + + +{{template "navbaradmin"}} +
+

Logs AdminDie letzten 50 Einträge

+ + + + + + + + {{range .items}} + + + + {{end}} + +
Logs
+ {{.}} +
+ +
+ + + \ No newline at end of file diff --git a/html/static/navbaradmin.html b/html/static/navbaradmin.html index dc51231..fc92a6e 100644 --- a/html/static/navbaradmin.html +++ b/html/static/navbaradmin.html @@ -1,6 +1,7 @@ {{define "navbaradmin"}}
Trikotwaschliste Admin
 +
Logs
Credits
 diff --git a/logbuffer/logbuffer.go b/logbuffer/logbuffer.go new file mode 100644 index 0000000..669c406 --- /dev/null +++ b/logbuffer/logbuffer.go @@ -0,0 +1,33 @@ +package logbuffer + +import ( + "fmt" + "github.com/gin-gonic/gin" + "time" +) + +func UseLogBuffer(queue *Queue) gin.HandlerFunc { + return gin.LoggerWithFormatter(func(param gin.LogFormatterParams) string { + output := fmt.Sprintf("%s - [%s] \"%s %s %s %d %s \"%s\" %s\"\n", + param.ClientIP, + param.TimeStamp.Format(time.RFC1123), + param.Method, + param.Path, + param.Request.Proto, + param.StatusCode, + param.Latency, + param.Request.UserAgent(), + param.ErrorMessage, + ) + + // Write the output to our queue + queue.push(output) + queue.Limit(50) + + // Return nothing + return "" + }) +} + + + diff --git a/logbuffer/queue.go b/logbuffer/queue.go new file mode 100644 index 0000000..c7bb49a --- /dev/null +++ b/logbuffer/queue.go @@ -0,0 +1,44 @@ +package logbuffer + +import "container/list" + +type Queue struct { + queue *list.List +} + +func New() *Queue{ + return &Queue{queue: list.New()} +} + +func (q Queue)push(value interface{}) { + q.queue.PushBack(value) +} + +func (q Queue)pop() interface{} { + element := q.queue.Front() + value := element.Value + q.queue.Remove(element) + return value +} + +func (q Queue)Length() int { + return q.queue.Len() +} + +// Limit the amount of items in the queue +func (q Queue)Limit(items int) { + for q.Length() > items { + // Remove items + q.pop() + } +} + +func (q Queue)ToSlice() []string { + var slice []string + element := q.queue.Front() + for i := 0; i < q.Length(); i++ { + slice = append(slice, element.Value.(string)) + element = element.Next() + } + return slice +} \ No newline at end of file diff --git a/main.go b/main.go index 242de56..8384233 100644 --- a/main.go +++ b/main.go @@ -9,6 +9,7 @@ import ( "log" "time" "trikotwaschliste/database/migrations" + "trikotwaschliste/logbuffer" "trikotwaschliste/models" "trikotwaschliste/routes" ) @@ -27,11 +28,16 @@ func main() { //Start postgres connection pool := createDatabasePool(cfg) + // Init the logging buffer for online log view + logbuf := logbuffer.New() + r.Use(logbuffer.UseLogBuffer(logbuf)) + r.LoadHTMLGlob("html/**/*") r.Static("/static", "html/static") //r.StaticFile("/favicon.ico", "html/favicon.ico") //routes.RoutesInit(r, pool) - routes.RoutesInit(r, pool, &cfg) + routes.RoutesInit(r, pool, &cfg, logbuf) + err = r.Run("0.0.0.0:8082") diff --git a/routes/routes.go b/routes/routes.go index a3691d8..538413d 100644 --- a/routes/routes.go +++ b/routes/routes.go @@ -4,10 +4,11 @@ import ( "github.com/gin-gonic/gin" "github.com/jackc/pgx/v4/pgxpool" "trikotwaschliste/handler" + "trikotwaschliste/logbuffer" "trikotwaschliste/models" ) -func RoutesInit(router *gin.Engine, pool *pgxpool.Pool, config *models.Config) { +func RoutesInit(router *gin.Engine, pool *pgxpool.Pool, config *models.Config, logbuf *logbuffer.Queue) { router.GET("/", handler.MainPage(pool)) router.GET("/credits", handler.Credits()) router.POST("/uploadname", handler.UploadName(pool)) @@ -22,5 +23,6 @@ func RoutesInit(router *gin.Engine, pool *pgxpool.Pool, config *models.Config) { // Basic auth routes authorized.GET("/", handler.AdminMainPage(pool)) authorized.POST("/changename", handler.ChangeName(pool)) + authorized.GET("/logs", handler.Logs(logbuf)) }