Return clear error for connection timeout

jasday · Oct 18, 2024 · c8c13e2 · c8c13e2
1 parent 70dde1f
commit c8c13e2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/gap_linux.go b/gap_linux.go
@@ -363,9 +363,6 @@ func (a *Adapter) Connect(address Address, params ConnectionParams) (Device, err
 		return Device{}, err
 	}
 
-	if params.ConnectionTimeout <= 0 {
-		params.ConnectionTimeout = NewDuration(30 * time.Second)
-	}
 	connectChan := make(chan error)
 	go func() {
 		for sig := range signal {
@@ -392,12 +389,15 @@ func (a *Adapter) Connect(address Address, params ConnectionParams) (Device, err
 		}
 	}()
 	go func() {
+		if params.ConnectionTimeout <= 0 {
+			params.ConnectionTimeout = NewDuration(30 * time.Second)
+		}
 		time.Sleep(time.Duration(params.ConnectionTimeout))
 		connected, err := device.device.GetProperty("org.bluez.Device1.Connected")
 		if !connected.Value().(bool) || err != nil {
 			a.bus.RemoveSignal(signal)
 			close(signal)
-			connectChan <- err
+			connectChan <- fmt.Errorf("connection timeout exceeded: %w", err)
 		}
 	}()