Skip to content

feat: Add timeout parameter #24

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

Merged
merged 1 commit into from
Dec 10, 2023
Merged

feat: Add timeout parameter #24

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
37 changes: 31 additions & 6 deletions src/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ var GuestSN = flag.String("guestsn", "0000000000000", "Guest serial number")
var GuestCPU_Arch = flag.String("cpu_arch", "QEMU, Virtual CPU, X86_64", "CPU arch")

var ApiPort = flag.String("api", ":2210", "API port")
var ApiTimeout = flag.Int("timeout", 45, "API timeout")
var ApiTimeout = flag.Int("timeout", 10, "Default timeout")
var ListenAddr = flag.String("addr", "0.0.0.0:12345", "Listen address")

func main() {
Expand Down Expand Up @@ -308,13 +308,31 @@ func read(w http.ResponseWriter, r *http.Request) {
defer Writer.Unlock()

query := r.URL.Query()
commandID, err := strconv.Atoi(query.Get("command"))
cmd := query.Get("command")
timeout := query.Get("timeout")
wait := time.Duration(*ApiTimeout)

if len(strings.TrimSpace(cmd)) == 0 {
fail(w, "No command specified")
return
}

commandID, err := strconv.Atoi(cmd)

if err != nil || commandID < 1 {
fail(w, fmt.Sprintf("Failed to parse command %s", query.Get("command")))
fail(w, fmt.Sprintf("Failed to parse command: %s", cmd))
return
}

if len(strings.TrimSpace(timeout)) > 0 {
duration, err := strconv.Atoi(timeout)
if err != nil || duration < 1 {
fail(w, fmt.Sprintf("Failed to parse timeout: %s", timeout))
return
}
wait = time.Duration(duration)
}

if Connection == nil || Chan == nil {
fail(w, "No connection to guest")
return
Expand All @@ -339,7 +357,7 @@ func read(w http.ResponseWriter, r *http.Request) {
select {
case res := <-Chan:
resp = res
case <-time.After(time.Duration(*ApiTimeout) * time.Second):
case <-time.After(wait * time.Second):
atomic.StoreInt32(&WaitingFor, 0)
fail(w, fmt.Sprintf("Timeout while reading command %d from guest", commandID))
return
Expand Down Expand Up @@ -374,10 +392,17 @@ func write(w http.ResponseWriter, r *http.Request) {
}

query := r.URL.Query()
commandID, err := strconv.Atoi(query.Get("command"))
cmd := query.Get("command")

if len(strings.TrimSpace(cmd)) == 0 {
fail(w, "No command specified")
return
}

commandID, err := strconv.Atoi(cmd)

if err != nil || commandID < 1 {
fail(w, fmt.Sprintf("Failed to parse command %s", query.Get("command")))
fail(w, fmt.Sprintf("Failed to parse command: %s", cmd))
return
}

Expand Down