From 0e1a6367ddf4b26fe57a7ac963009b9ed2258077 Mon Sep 17 00:00:00 2001 From: Kroese Date: Sun, 10 Dec 2023 05:03:40 +0100 Subject: [PATCH 1/2] fix: Increase timeout --- src/main.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.go b/src/main.go index c175cdb..e8aeb8f 100644 --- a/src/main.go +++ b/src/main.go @@ -78,7 +78,7 @@ var HostModel = flag.String("model", "Virtualhost", "Host model name") var HostMAC = flag.String("mac", "00:00:00:00:00:00", "Host MAC address") var HostSN = flag.String("hostsn", "0000000000000", "Host serial number") var GuestSN = flag.String("guestsn", "0000000000000", "Guest serial number") -var GuestCPU_ARCH = flag.String("cpu_arch", "QEMU, Virtual CPU, X86_64", "CPU arch") +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") @@ -252,7 +252,7 @@ func payload(req REQ) string { data = strings.ToUpper(*GuestSN) case 7: // CPU info data = fmt.Sprintf(`{"cpuinfo":"%s","vcpu_num":%d}`, - *GuestCPU_ARCH+", "+strconv.Itoa(*GuestCPUs), *GuestCPUs) + *GuestCPU_Arch+", "+strconv.Itoa(*GuestCPUs), *GuestCPUs) case 8: // VM version data = fmt.Sprintf(`{"id":"Virtualization","name":"Virtual Machine Manager","timestamp":%d,"version":"%s"}`, *VmTimestamp, *VmVersion) @@ -339,7 +339,7 @@ func read(w http.ResponseWriter, r *http.Request) { select { case res := <-Chan: resp = res - case <-time.After(ApiTimeout * time.Second): + case <-time.After(*ApiTimeout * time.Second): atomic.StoreInt32(&WaitingFor, 0) fail(w, fmt.Sprintf("Timeout while reading command %d from guest", commandID)) return From 880ade15440e44d0b16f1df983178d3733744f87 Mon Sep 17 00:00:00 2001 From: Kroese Date: Sun, 10 Dec 2023 05:06:39 +0100 Subject: [PATCH 2/2] fix: Increase timeout --- src/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.go b/src/main.go index e8aeb8f..e49f7c7 100644 --- a/src/main.go +++ b/src/main.go @@ -339,7 +339,7 @@ func read(w http.ResponseWriter, r *http.Request) { select { case res := <-Chan: resp = res - case <-time.After(*ApiTimeout * time.Second): + case <-time.After(time.Duration(*ApiTimeout) * time.Second): atomic.StoreInt32(&WaitingFor, 0) fail(w, fmt.Sprintf("Timeout while reading command %d from guest", commandID)) return