debug

Author: joecorall

cmd/extensions.go

@@ -4,13 +4,15 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"sort"
 	"strconv"
 	"strings"
 
 	"charm.land/lipgloss/v2"
+	"github.com/kballard/go-shellquote"
 	"github.com/libops/sitectl/pkg/config"
 	"github.com/libops/sitectl/pkg/docker"
 	"github.com/libops/sitectl/pkg/plugin"
@@ -112,20 +114,25 @@ func init() {
 }
 
 func renderDrupalDebug() (string, error) {
+	slog.Debug("starting plugin debug", "plugin", "drupal")
 	if sdk == nil {
 		return "", fmt.Errorf("plugin sdk is not initialized")
 	}
 	ctx, err := sdk.GetContext()
 	if err != nil {
 		return "", err
 	}
+	slog.Debug("resolved plugin context", "plugin", "drupal", "context", ctx.Name, "project_dir", ctx.ProjectDir)
+	slog.Debug("creating file accessor", "plugin", "drupal")
 	files, err := plugin.NewFileAccessor(ctx)
 	if err != nil {
 		return "", err
 	}
 	defer files.Close()
 
+	slog.Debug("resolving drupal root", "plugin", "drupal", "rootfs", drupalRootfsPath)
 	drupalRoot := resolveDrupalRoot(files, ctx.ProjectDir, drupalRootfsPath)
+	slog.Debug("resolved drupal root", "plugin", "drupal", "drupal_root", drupalRoot)
 	configDir := filepath.Join(drupalRoot, "config", "sync")
 	body := []string{
 		debugDivider(),
@@ -141,14 +148,18 @@ func renderDrupalDebug() (string, error) {
 	}
 
 	if strings.TrimSpace(drupalRoot) == "" {
+		slog.Debug("drupal root unavailable; skipping extension scan", "plugin", "drupal")
 		body = append(body, "", "Installed modules: unavailable")
 		return renderDebugPanel("drupal", strings.Join(body, "\n")), nil
 	}
 
+	slog.Debug("reading core.extension.yml", "plugin", "drupal", "path", filepath.Join(configDir, "core.extension.yml"))
 	modules, themes, err := readCoreExtension(files, filepath.Join(configDir, "core.extension.yml"))
 	if err != nil {
 		return "", err
 	}
+	slog.Debug("read installed extensions", "plugin", "drupal", "modules", len(modules), "themes", len(themes))
+	slog.Debug("rendering cache_page summary", "plugin", "drupal")
 	cachePageSummary, err := renderCachePageSummary()
 	if err != nil {
 		body = append(body, "", debugDivider(), "", debugTitleStyle.Render("Cache Page"), "", formatDebugRows([]debugRow{
@@ -166,6 +177,7 @@ func renderDrupalDebug() (string, error) {
 	configLines = append(configLines, formatListLines(themes, 3)...)
 	body = append(body, "", strings.Join(configLines, "\n"))
 
+	slog.Debug("finished plugin debug", "plugin", "drupal")
 	return renderDebugPanel("drupal", strings.Join(body, "\n")), nil
 }
 
@@ -177,7 +189,7 @@ func renderCachePageSummary() (string, error) {
 	defer cli.Close()
 
 	query := "SELECT COALESCE(data_length + index_length, 0) FROM information_schema.TABLES WHERE table_schema = DATABASE() AND table_name = 'cache_page';"
-	output, err := execDrupalCommandCapture(cli, containerName, []string{"drush", "sql:query", query, "--extra=--batch --skip-column-names"})
+	output, err := execDrupalCommandCapture(cli, containerName, []string{"drush", "sql:query", query, "--extra=--batch", "--extra=--skip-column-names"})
 	if err != nil {
 		return "", err
 	}
@@ -223,12 +235,16 @@ func getDrupalContainerForSDK() (ctx *config.Context, cli *docker.DockerClient,
 }
 
 func execDrupalCommandCapture(cli *docker.DockerClient, containerName string, cmd []string) (string, error) {
+	slog.Debug(strings.Join(cmd, " "), "plugin", "drupal", "container", containerName)
 	var stdout bytes.Buffer
 	var stderr bytes.Buffer
 
+	wrappedCmd := []string{"bash", "-lc", fmt.Sprintf("cd /var/www/drupal && %s", shellquote.Join(cmd...))}
+
 	exitCode, err := cli.Exec(context.Background(), docker.ExecOptions{
 		Container:    containerName,
-		Cmd:          cmd,
+		Cmd:          wrappedCmd,
+		WorkingDir:   "/var/www/drupal",
 		AttachStdout: true,
 		AttachStderr: true,
 		Stdout:       &stdout,