FIX: loop in shutdown code rewritten to work properly

Signed-off-by: invario <67800603+invario@users.noreply.github.com>

Author: invario

backend/networking/shutdown.go

@@ -61,31 +61,46 @@ func ShutdownDevice(device *core.Record) error {
 
 	for {
 		select {
-		case <-time.After(1 * time.Second):
-			if time.Since(start) >= time.Duration(shutdownTimeout)*time.Second {
-				if err := KillProcess(cmd.Process); err != nil {
-					logger.Error.Println(err)
+		case err := <-done:
+			if err != nil {
+				return fmt.Errorf("%s", stderr.String())
+			} else {
+				for {
+					isOnline, err := PingDevice(device)
+					if err != nil {
+						logger.Error.Println(err)
+						return err
+					}
+					if isOnline {
+						if time.Since(start) >= time.Duration(shutdownTimeout)*time.Second {
+							return fmt.Errorf("%s not offline after %d seconds", device.GetString("name"), shutdownTimeout)
+						}
+					}
+					if !isOnline {
+						return nil
+					}
+					time.Sleep(1 * time.Second)
 				}
-				return fmt.Errorf("%s not offline after %d seconds", device.GetString("name"), shutdownTimeout)
 			}
+		default:
 			isOnline, err := PingDevice(device)
 			if err != nil {
 				logger.Error.Println(err)
 				return err
 			}
-			if !isOnline {
+			if time.Since(start) >= time.Duration(shutdownTimeout)*time.Second {
 				if err := KillProcess(cmd.Process); err != nil {
 					logger.Error.Println(err)
 				}
-				return nil
+				return fmt.Errorf("%s not offline after %d seconds", device.GetString("name"), shutdownTimeout)
 			}
-		case err := <-done:
-			if err != nil {
+			if !isOnline {
 				if err := KillProcess(cmd.Process); err != nil {
 					logger.Error.Println(err)
 				}
-				return fmt.Errorf("%s", stderr.String())
+				return nil
 			}
+			time.Sleep(1 * time.Second)
 		}
 	}
 }