Skip to content

socket: fixing possible mixed up response with events #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

socket: fixing possible mixed up response with events #210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions qmp/socket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,29 @@ func (mon *SocketMonitor) Connect() error {
return err
}

// Check for no error on return
var r response
if err := dec.Decode(&r); err != nil {
return err
}
if err := r.Err(); err != nil {
return err
// Wait for response
scanner := bufio.NewScanner(mon.c)
for scanner.Scan() {
var e Event

b := scanner.Bytes()
if err := json.Unmarshal(b, &e); err != nil {
return err
}

// If not an event then our qmp capabilities response
if e.Event == "" {
var r response
if err := json.Unmarshal(b, &r); err != nil {
return err
}
// Check response on errors
if err := r.Err(); err != nil {
return err
}
break
}
// Drop possible event, continue reading
}

// Initialize socket listener for command responses and asynchronous
Expand Down