Skip to content

V
varnishapi
Commit e67a0f88 authored by Geoff Simmons's avatar Geoff Simmons
Browse files
Options

Bugfix parsing vcl.list output.

parent 190a3863
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
pkg/admin/cli.go
View file @ e67a0f88
...@@ -541,7 +541,7 @@ func (adm *Admin) VCLList() ([]VCLData, error) { ...@@ -541,7 +541,7 @@ func (adm *Admin) VCLList() ([]VCLData, error) {
fmt.Errorf("Unknown temperature %s: %s", fmt.Errorf("Unknown temperature %s: %s",
main[3], vcl) main[3], vcl)
} }
if b, e := strconv.ParseUint(main[4], 0, 0); e != nil { if b, e := strconv.ParseUint(main[4], 0, 0); e == nil {
datum.Busy = uint(b) datum.Busy = uint(b)
} else { } else {
return data, return data,
...@@ -556,7 +556,7 @@ func (adm *Admin) VCLList() ([]VCLData, error) { ...@@ -556,7 +556,7 @@ func (adm *Admin) VCLList() ([]VCLData, error) {
} }
if datum.State != Label { if datum.State != Label {
if r := vclLblRefs.FindStringSubmatch(vcl); r != nil { if r := vclLblRefs.FindStringSubmatch(vcl); r != nil {
if n, err := strconv.ParseUint(r[1], 0, 0); err != nil { if n, err := strconv.ParseUint(r[1], 0, 0); err == nil {
datum.Labels = uint(n) datum.Labels = uint(n)
} else { } else {
return data, return data,
...@@ -569,7 +569,7 @@ func (adm *Admin) VCLList() ([]VCLData, error) { ...@@ -569,7 +569,7 @@ func (adm *Admin) VCLList() ([]VCLData, error) {
} else { } else {
if l := vclLbls.FindStringSubmatch(vcl); l != nil { if l := vclLbls.FindStringSubmatch(vcl); l != nil {
datum.LabelVCL = l[1] datum.LabelVCL = l[1]
if n, err := strconv.ParseUint(l[2], 0, 0); err != nil { if n, err := strconv.ParseUint(l[2], 0, 0); err == nil {
datum.LabelReturns = uint(n) datum.LabelReturns = uint(n)
} else { } else {
return data, return data,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment