rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move cron to drupal page

Browse source
This commit is contained in:
Tom Wiesing 2023-11-10 20:23:55 +01:00
parent 7c544d9ae4
commit 7fefb689c7
No known key found for this signature in database
9 changed files with 61 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/dis/component/server/admin/html/instance.html
View file

@ -211,16 +211,7 @@
<tr>
<td>
Last Rebuild <br>
<a class="pure-button" href="/admin/rebuild/{{ .Info.Slug }}">Rebuild</button>
</td>
<td>
<code class="date">{{ .Info.LastRebuild.Format "2006-01-02T15:04:05Z07:00" }}</code>
</td>
</tr>
<tr>
<td>
Last Cron<br>
<button class="remote-action pure-button pure-button-action" data-action="cron" data-param="{{ .Instance.Slug }}" data-buffer="1000" data-force-reload>Cron</button>
<a class="pure-button" href="/admin/instance/{{ .Info.Slug }}/rebuild">Rebuild</button>
</td>
<td>
<code class="date">{{ .Info.LastRebuild.Format "2006-01-02T15:04:05Z07:00" }}</code>

9
internal/dis/component/server/admin/html/instance_drupal.html
View file

@ -30,6 +30,15 @@
<code>{{ .DefaultTheme }}</code>
</td>
</tr>
<tr>
<td>
Last Cron<br>
<button class="remote-action pure-button pure-button-action" data-action="cron" data-param="{{ .Instance.Slug }}" data-buffer="1000" data-force-reload>Cron</button>
</td>
<td>
<code class="date">{{ .LastCron.Format "2006-01-02T15:04:05Z07:00" }}</code>
</td>
</tr>
</tbody>
</table>
</div>

37
internal/dis/component/server/admin/instance_drupal.go
View file

@ -5,6 +5,7 @@ import (
_ "embed"
"html/template"
"net/http"
"time"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/server/assets"
@ -12,6 +13,7 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/status"
"github.com/FAU-CDI/wisski-distillery/internal/wisski"
"github.com/tkw1536/pkglib/httpx"
"golang.org/x/sync/errgroup"
"github.com/julienschmidt/httprouter"
)
@ -33,6 +35,8 @@ type instanceDrupalContext struct {
DefaultTheme string
Requirements []status.Requirement
LastCron time.Time
}
func (admin *Admin) instanceDrupal(ctx context.Context) http.Handler {
@ -55,24 +59,33 @@ func (admin *Admin) instanceDrupal(ctx context.Context) http.Handler {
return ctx, nil, httpx.ErrNotFound
}
server := ctx.Instance.PHP().NewServer()
defer server.Close()
var eg errgroup.Group
// get the requirements
ctx.Requirements, err = ctx.Instance.Requirements().Get(r.Context(), server)
if err != nil {
return ctx, nil, httpx.ErrInternalServerError
}
eg.Go(func() (err error) {
ctx.Requirements, err = ctx.Instance.Requirements().Get(r.Context(), nil)
return
})
// get the drupal version
ctx.DrupalVersion, err = ctx.Instance.Version().Get(r.Context(), server)
if err != nil {
return ctx, nil, httpx.ErrInternalServerError
}
eg.Go(func() (err error) {
ctx.DrupalVersion, err = ctx.Instance.Version().Get(r.Context(), nil)
return
})
// get the default theme
ctx.DefaultTheme, err = ctx.Instance.Theme().Get(r.Context(), server)
if err != nil {
eg.Go(func() (err error) {
ctx.DefaultTheme, err = ctx.Instance.Theme().Get(r.Context(), nil)
return
})
// last time cron was executed
eg.Go(func() (err error) {
ctx.LastCron, err = ctx.Instance.Drush().LastCron(r.Context(), nil)
return
})
if err = eg.Wait(); err != nil {
return ctx, nil, httpx.ErrInternalServerError
}

2
internal/dis/distillery.go
View file

@ -143,7 +143,7 @@ func (dis *Distillery) Purger() *purger.Purger {
// THESE SHOULD NEVER BE CALLED DIRECTLY
//
func (dis *Distillery) allComponents(context *lifetime.RegisterContext[component.Component, component.Still]) {
func (dis *Distillery) allComponents(context *lifetime.Registry[component.Component, component.Still]) {
lifetime.Place[*docker.Docker](context)
lifetime.Place[*binder.Binder](context)
lifetime.Place[*web.Web](context)

8
internal/wisski/ingredient/barrel/build.go
View file

@ -71,7 +71,11 @@ type LastRebuildFetcher struct {
}
}
func (lbr *LastRebuildFetcher) Fetch(ctx context.Context, flags ingredient.FetcherFlags, info *status.WissKI) (err error) {
info.LastRebuild, _ = lbr.dependencies.Barrel.LastRebuild(ctx)
var (
_ ingredient.WissKIFetcher = (*LastRebuildFetcher)(nil)
)
func (lbr *LastRebuildFetcher) Fetch(flags ingredient.FetcherFlags, info *status.WissKI) (err error) {
info.LastRebuild, _ = lbr.dependencies.Barrel.LastRebuild(flags.Context)
return
}

2
internal/wisski/ingredient/barrel/drush/cron.go
View file

@ -55,6 +55,6 @@ func (lbr *LastCronFetcher) Fetch(flags ingredient.FetcherFlags, info *status.Wi
return
}
info.LastRebuild, _ = lbr.dependencies.Drush.LastCron(flags.Context, flags.Server)
info.LastCron, _ = lbr.dependencies.Drush.LastCron(flags.Context, flags.Server)
return
}

2
internal/wisski/wisski.go
View file

@ -143,7 +143,7 @@ func (wisski *WissKI) Theme() *extras.Theme {
// THESE SHOULD NEVER BE CALLED DIRECTLY
//
func (wisski *WissKI) allIngredients(context *lifetime.RegisterContext[ingredient.Ingredient, *liquid.Liquid]) {
func (wisski *WissKI) allIngredients(context *lifetime.Registry[ingredient.Ingredient, *liquid.Liquid]) {
// core bits
lifetime.Place[*locker.Locker](context)
lifetime.Register(context, func(m *mstore.MStore, _ *liquid.Liquid) {