Fixed parser issue with quotes in an ignored line
This commit is contained in:
parent
ac45a8625b
commit
9cc26fe41c
14
parser.go
14
parser.go
@ -141,7 +141,7 @@ func (p *Parser) Parse(fn string) (*AlrmConfig, error) {
|
|||||||
case TK_CHECK:
|
case TK_CHECK:
|
||||||
if check == nil {
|
if check == nil {
|
||||||
if host == nil {
|
if host == nil {
|
||||||
return nil, fmt.Errorf("host token without initialization")
|
return nil, fmt.Errorf("check token without initialization")
|
||||||
}
|
}
|
||||||
check, err = NewCheck(strings.ToLower(tk), host.GetAddress())
|
check, err = NewCheck(strings.ToLower(tk), host.GetAddress())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -151,7 +151,14 @@ func (p *Parser) Parse(fn string) (*AlrmConfig, error) {
|
|||||||
host.Checks = append(host.Checks, check)
|
host.Checks = append(host.Checks, check)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
check.Parse(tk)
|
cont, err := check.Parse(tk)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if !cont {
|
||||||
|
p.prevState()
|
||||||
|
goto stateswitch
|
||||||
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return nil, fmt.Errorf("unknown parser state: %d", p.state())
|
return nil, fmt.Errorf("unknown parser state: %d", p.state())
|
||||||
@ -214,6 +221,7 @@ func (p *Parser) Split(data []byte, atEOF bool) (int, []byte, error) {
|
|||||||
|
|
||||||
for i := 0; i < len(data); i++ {
|
for i := 0; i < len(data); i++ {
|
||||||
c := data[i]
|
c := data[i]
|
||||||
|
// fmt.Printf("%c (%t) (%t)\n", c, started, ignoreline)
|
||||||
switch c {
|
switch c {
|
||||||
case '\f', '\n', '\r':
|
case '\f', '\n', '\r':
|
||||||
p.Line++
|
p.Line++
|
||||||
@ -233,7 +241,7 @@ func (p *Parser) Split(data []byte, atEOF bool) (int, []byte, error) {
|
|||||||
return i + 1, data[startidx:i], nil
|
return i + 1, data[startidx:i], nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if quote == 0 {
|
if !ignoreline && quote == 0 {
|
||||||
quote = c
|
quote = c
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
set alert "Don't think about it"
|
# set alert "Don't think about it"
|
||||||
|
|
||||||
monitor group
|
monitor group
|
||||||
host www1.example.com address 10.11.135.101
|
host www1.example.com address 10.11.135.101
|
||||||
|
Loading…
Reference in New Issue
Block a user