cmd/cli: better error if internal log is not available

This commit is contained in:
Cuong Manh Le
2025-01-21 00:21:16 +07:00
committed by Cuong Manh Le
parent 9718ab8579
commit 7ed6733fb7
2 changed files with 8 additions and 5 deletions

View File

@@ -31,6 +31,10 @@ import (
)
func initLogCmd() *cobra.Command {
warnRuntimeLoggingNotEnabled := func() {
mainLog.Load().Warn().Msg("runtime debug logging is not enabled")
mainLog.Load().Warn().Msg(`ctrld may be running without "--cd" flag or logging is already enabled`)
}
logSendCmd := &cobra.Command{
Use: "send",
Short: "Send runtime debug logs to ControlD",
@@ -54,8 +58,7 @@ func initLogCmd() *cobra.Command {
mainLog.Load().Warn().Msg("runtime logs could only be sent once per minute")
return
case http.StatusMovedPermanently:
mainLog.Load().Warn().Msg("runtime debugs log is not enabled")
mainLog.Load().Warn().Msg(`ctrld may be run without "--cd" flag or logging is already enabled`)
warnRuntimeLoggingNotEnabled()
return
}
var logs logSentResponse
@@ -92,8 +95,7 @@ func initLogCmd() *cobra.Command {
switch resp.StatusCode {
case http.StatusMovedPermanently:
mainLog.Load().Warn().Msg("runtime debugs log is not enabled")
mainLog.Load().Warn().Msg(`ctrld may be run without "--cd" flag or logging is already enabled`)
warnRuntimeLoggingNotEnabled()
return
case http.StatusBadRequest:
mainLog.Load().Warn().Msg("runtime debugs log is not available")

View File

@@ -6,6 +6,7 @@ import (
"fmt"
"io"
"os"
"strings"
"sync"
"time"
@@ -165,7 +166,7 @@ func (p *prog) logReader() (*logReader, error) {
return lr, nil
}
if p.cfg.Service.LogPath == "" {
return nil, nil
return &logReader{r: io.NopCloser(strings.NewReader(""))}, nil
}
f, err := os.Open(normalizeLogFilePath(p.cfg.Service.LogPath))
if err != nil {