mirror of
https://github.com/Control-D-Inc/ctrld.git
synced 2026-02-03 22:18:39 +00:00
cmd/cli: better error if internal log is not available
This commit is contained in:
committed by
Cuong Manh Le
parent
9718ab8579
commit
7ed6733fb7
@@ -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")
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user