extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-05-31 07:09:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd control status: warn about inactive tasks

Browse Source 
refs #10
This commit is contained in:
Christian Schwarz 2017-12-27 12:56:46 +01:00
parent 4b3d83ec1f
commit 835cf6b12f
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/control.go
View File

@ -236,8 +236,9 @@ func doControlStatusCmd(cmd *cobra.Command, args []string) {
fmt.Fprint(&header, "<idle>") fmt.Fprint(&header, "<idle>")
} }
fmt.Fprint(&header, " ") fmt.Fprint(&header, " ")
const TASK_STALLED_HOLDOFF_DURATION = 10 * time.Second
sinceLastUpdate := now.Sub(task.LastUpdate)
if !task.Idle || task.ProgressRx != 0 || task.ProgressTx != 0 { if !task.Idle || task.ProgressRx != 0 || task.ProgressTx != 0 {
fmt.Fprintf(&header, "(%s / %s , Rx/Tx", fmt.Fprintf(&header, "(%s / %s , Rx/Tx",
humanize.Bytes(uint64(task.ProgressRx)), humanize.Bytes(uint64(task.ProgressRx)),
humanize.Bytes(uint64(task.ProgressTx))) humanize.Bytes(uint64(task.ProgressTx)))
@ -247,6 +248,12 @@ func doControlStatusCmd(cmd *cobra.Command, args []string) {
fmt.Fprint(&header, ")") fmt.Fprint(&header, ")")
} }
fmt.Fprint(&header, "\n") fmt.Fprint(&header, "\n")
if !task.Idle && !task.LastUpdate.IsZero() && sinceLastUpdate >= TASK_STALLED_HOLDOFF_DURATION {
fmt.Fprintf(&header, " WARNING: last update %s ago at %s)",
sinceLastUpdate.String(),
task.LastUpdate.Format(HumanFormatterDateFormat))
fmt.Fprint(&header, "\n")
}
io.Copy(os.Stdout, &header) io.Copy(os.Stdout, &header)
var logBuf bytes.Buffer var logBuf bytes.Buffer

4
cmd/logging_formatters.go
View File

@ -44,6 +44,8 @@ type HumanFormatter struct {
ignoreFields map[string]bool ignoreFields map[string]bool
} }
const HumanFormatterDateFormat = time.RFC3339
func (f *HumanFormatter) SetMetadataFlags(flags MetadataFlags) { func (f *HumanFormatter) SetMetadataFlags(flags MetadataFlags) {
f.metadataFlags = flags f.metadataFlags = flags
} }
@ -69,7 +71,7 @@ func (f *HumanFormatter) Format(e *logger.Entry) (out []byte, err error) {
var line bytes.Buffer var line bytes.Buffer
if f.metadataFlags&MetadataTime != 0 { if f.metadataFlags&MetadataTime != 0 {
fmt.Fprintf(&line, "%s ", e.Time.Format(time.RFC3339)) fmt.Fprintf(&line, "%s ", e.Time.Format(HumanFormatterDateFormat))
} }
if f.metadataFlags&MetadataLevel != 0 { if f.metadataFlags&MetadataLevel != 0 {
fmt.Fprintf(&line, "[%s]", e.Level.Short()) fmt.Fprintf(&line, "[%s]", e.Level.Short())