Merge pull request #51 from factorysh/features/logs-ui

Add logs text/html endpoint

Author: athoune

application/application.go

@@ -153,6 +153,7 @@ func New(cfg *conf.Conf) (*Application, error) {
 						r.Get("/", a.TaskHandler(false))
 						r.Get("/volumes/*", a.VolumesHandler(6, false))
 						r.Get("/logs", a.TaskLogsHandler(false))
+						r.Get("/logz", a.TaskLogzHandler(false))
 					})
 					r.Group(func(r chi.Router) {
 						r.Use(a.RefererMiddleware)
@@ -166,6 +167,7 @@ func New(cfg *conf.Conf) (*Application, error) {
 						r.Get("/", a.TaskHandler(true))
 						r.Get("/volumes/*", a.VolumesHandler(6, true))
 						r.Get("/logs", a.TaskLogsHandler(true))
+						r.Get("/logz", a.TaskLogzHandler(true))
 					})
 					r.Group(func(r chi.Router) {
 						r.Use(a.RefererMiddleware)

application/logs.go

@@ -0,0 +1,45 @@
+package application
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"html/template"
+	"net/http"
+
+	"github.com/docker/docker/pkg/stdcopy"
+	"github.com/factorysh/microdensity/html"
+	"github.com/factorysh/microdensity/task"
+)
+
+func (a *Application) renderLogsPageForTask(ctx context.Context, t *task.Task, w http.ResponseWriter) error {
+
+	reader, err := t.Logs(ctx, false)
+	if err != nil {
+		return err
+	}
+
+	var buffer bytes.Buffer
+	var dropped bytes.Buffer
+	_, err = stdcopy.StdCopy(&buffer, &dropped, reader)
+	if err != nil {
+		return err
+	}
+
+	data, err := NewTaskPage(t, template.HTML(fmt.Sprintf("<pre>%s</pre>", buffer.String())), a.GitlabURL, "Task Logs", "terminal")
+	if err != nil {
+		return err
+	}
+
+	p := html.Page{
+		Domain: a.Domain,
+		Detail: fmt.Sprintf("%s / %s - logs", t.Service, t.Commit),
+		Partial: html.Partial{
+			Template: taskTemplate,
+			Data:     data,
+		},
+	}
+
+	w.WriteHeader(http.StatusOK)
+	return p.Render(w)
+}

application/result.go

@@ -231,3 +231,39 @@ func (a *Application) TaskLogsHandler(latest bool) func(http.ResponseWriter, *ht
 	}
 
 }
+
+// TaskLogzHandler get a logs for a task
+func (a *Application) TaskLogzHandler(latest bool) func(http.ResponseWriter, *http.Request) {
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		l := a.logger.With(
+			zap.String("url", r.URL.String()),
+			zap.String("service", chi.URLParam(r, "serviceID")),
+			zap.String("project", chi.URLParam(r, "project")),
+			zap.String("branch", chi.URLParam(r, "branch")),
+			zap.String("commit", chi.URLParam(r, "commit")),
+		)
+
+		t, err := a.storage.GetByCommit(
+			chi.URLParam(r, "serviceID"),
+			chi.URLParam(r, "project"),
+			chi.URLParam(r, "branch"),
+			chi.URLParam(r, "commit"),
+			latest,
+		)
+		if err != nil {
+			l.Warn("Task get error", zap.Error(err))
+			w.WriteHeader(http.StatusNotFound)
+			w.Write([]byte(http.StatusText(http.StatusNotFound)))
+			return
+		}
+
+		err = a.renderLogsPageForTask(r.Context(), t, w)
+		if err != nil {
+			l.Warn("when rendering a logs page", zap.Error(err))
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(http.StatusText(http.StatusInternalServerError)))
+			return
+		}
+	}
+}

application/task.go

@@ -0,0 +1,42 @@
+package application
+
+import (
+	"html/template"
+	"net/url"
+
+	"github.com/factorysh/microdensity/task"
+)
+
+// TaskPage present a page and an associated inner content
+type TaskPage struct {
+	GitlabDomain    string
+	Domain          string
+	Project         string
+	Commit          string
+	Service         string
+	ID              string
+	CreatedAt       string
+	InnerDivClasses string
+	InnerTitle      string
+	Inner           template.HTML
+}
+
+// NewTaskPage inits a result for a task
+func NewTaskPage(t *task.Task, inner template.HTML, gitlabDomain, InnerTitle, InnerDivClasses string) (*TaskPage, error) {
+	prettyPath, err := url.PathUnescape(t.Project)
+	if err != nil {
+		return nil, err
+	}
+
+	return &TaskPage{
+		Project:         prettyPath,
+		GitlabDomain:    gitlabDomain,
+		Commit:          t.Commit,
+		Service:         t.Service,
+		ID:              t.Id.String(),
+		CreatedAt:       t.Creation.Format("2006-01-02 15:04:05"),
+		InnerTitle:      InnerTitle,
+		InnerDivClasses: InnerDivClasses,
+		Inner:           inner,
+	}, nil
+}

application/task_page.go

@@ -8,8 +8,8 @@ <h3>Task Description</h3>
     <li>ID : {{ .ID }}</li>
 </ul>
 
-<h3>Task Result</h3>
+<h3>{{ .InnerTitle }}</h3>
 
-<div class="container task-output">
+<div class="{{ .InnerDivClasses }}">
     {{ .Inner }}
 </div>

application/templates/result.html renamed to application/templates/task.html

@@ -19,8 +19,8 @@ import (
 var (
 	// used to ensure embed import
 	_ embed.FS
-	//go:embed templates/result.html
-	resultTemplate string
+	//go:embed templates/task.html
+	taskTemplate string
 )
 
 // VolumesHandler expose volumes of a task
@@ -65,7 +65,7 @@ func (a *Application) VolumesHandler(basePathLen int, latest bool) http.HandlerF
 		if _, err := os.Stat(fullPath); os.IsNotExist(err) {
 			l.Warn("Path not found", zap.Error(err))
 
-			data, err := NewResultFromTask(t, "No result for this task", a.GitlabURL)
+			data, err := NewTaskPage(t, "No result for this task", a.GitlabURL, "Task Result", "container task-output")
 			if err != nil {
 				l.Error("when creating result from a task", zap.Error(err))
 				w.WriteHeader(http.StatusInternalServerError)
@@ -76,7 +76,7 @@ func (a *Application) VolumesHandler(basePathLen int, latest bool) http.HandlerF
 				Domain: a.Domain,
 				Detail: fmt.Sprintf("%s / %s", t.Service, t.Commit),
 				Partial: html.Partial{
-					Template: resultTemplate,
+					Template: taskTemplate,
 					Data:     data,
 				}}
 
@@ -128,13 +128,13 @@ func (a *Application) renderResultPageForTask(t *task.Task, filePath string, w h
 		return err
 	}
 
-	data, err := NewResultFromTask(t, template.HTML(content), a.GitlabURL)
+	data, err := NewTaskPage(t, template.HTML(content), a.GitlabURL, "Task Result", "container task-output")
 	// create the page
 	p := html.Page{
 		Domain: a.Domain,
 		Detail: fmt.Sprintf("%s / %s", t.Service, t.Commit),
 		Partial: html.Partial{
-			Template: resultTemplate,
+			Template: taskTemplate,
 			Data:     data,
 		},
 	}

application/volume.go

@@ -69,3 +69,22 @@ h6 {
   background-color: white;
   padding: 2rem;
 }
+
+.terminal {
+  min-height: 30%;
+  padding: 2rem;
+  background-color: black;
+  color: white;
+  border-radius: 1rem;
+  font-family: monospace;
+  text-align: left;
+}
+
+.terminal pre {
+  background-color: black;
+  border-left: none;
+  margin: 1rem;
+  padding: 1rem;
+  overflow-x: scroll;
+  overflow-y: hidden;
+}