diff --git a/backend/Admin/rides/monitorRide.php b/backend/Admin/rides/monitorRide.php index f3d9a519..bfefa32a 100644 --- a/backend/Admin/rides/monitorRide.php +++ b/backend/Admin/rides/monitorRide.php @@ -131,9 +131,11 @@ if ($rideDriverID) { error_log("[MONITOR_RIDE] 6. Querying Tracking DB for Driver ID: " . $rideDriverID); $location = null; -if ($rideDriverID && isset($con_tracking) && $con_tracking) { +if ($rideDriverID) { try { - $locationQuery = $con_tracking->prepare(" + $trackingDb = null; + try { $trackingDb = Database::get('tracking'); } catch (Throwable $e) { $trackingDb = $con; } + $locationQuery = $trackingDb->prepare(" SELECT latitude, longitude, speed, heading, updated_at FROM car_locations WHERE driver_id = :driverID AND status = 'ON' diff --git a/backend/connect.php b/backend/connect.php index 9e26b084..ca40671b 100644 --- a/backend/connect.php +++ b/backend/connect.php @@ -37,9 +37,6 @@ $role = $decoded->role ?? 'passenger'; // 3. Database Connection try { $con = Database::get('main'); - try { $con_tracking = Database::get('tracking'); } catch (Throwable $e) { $con_tracking = $con; } - try { $con_ride = Database::get('ride'); } catch (Throwable $e) { $con_ride = $con; } - try { $con_transit = Database::get('transit'); } catch (Throwable $e) { $con_transit = $con; } } catch (Exception $e) { http_response_code(500); exit(json_encode(['error' => 'Database connection failed']));