gibheer/monzero
1
0
Fork 1
Code Issues 3 Pull Requests Releases 1 Wiki Activity

monwork - bytes.Fields works well enough

Browse Source 
This function existed to group fields together, but it had an issue and
grouped them wrongly. This caused issues later in the check stage.
This commit is contained in:
Gibheer 2018-12-13 16:20:42 +01:00
parent 82e582f022
commit ff79584084
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/monwork/main.go
View File

@ -167,7 +167,7 @@ func startConfigGen(db *sql.DB, checkInterval time.Duration) {
time.Sleep(checkInterval)
continue
}
if _, err := tx.Exec(SQLRefreshActiveCheck, check_id, pq.Array(stringToShellFields(cmd.Bytes()))); err != nil {
if _, err := tx.Exec(SQLRefreshActiveCheck, check_id, pq.Array(bytes.Fields(cmd.Bytes()))); err != nil {
tx.Rollback()
log.Printf("could not refresh check '%d': %s", check_id, err)
continue
@ -184,35 +184,6 @@ func startConfigGen(db *sql.DB, checkInterval time.Duration) {
}
}
func stringToShellFields(in []byte) [][]byte {
if len(in) == 0 {
return [][]byte{}
}
fields := bytes.Fields(in)
result := [][]byte{fields[0]}
var quote byte
for _, field := range fields[1:] {
if quote == 0 && (field[0] != '\'' && field[0] != '"') {
result = append(result, field)
continue
}
if quote == 0 && (field[0] == '\'' || field[0] == '"') {
quote = field[0]
result = append(result, field)
continue
}
idx := len(result) - 1
result[idx] = append(result[idx], append([]byte(" "), field...)...)
if quote != 0 && (bytes.HasSuffix(field, []byte{quote})) {
quote = 0
continue
}
}
return result
}
var (
SQLGetConfigUpdates = `select c.id, co.command, c.options
from checks c