From 8227b79fb0688cfb7ae1022f43d2c34b25289830 Mon Sep 17 00:00:00 2001 From: Griffin Tabor Date: Wed, 29 Nov 2023 17:23:53 -0700 Subject: [PATCH] [windows] Remove python2 specific hack This PR https://github.com/ros/ros_comm/pull/1872 made windows act differently than linux because of a specific python 2 delay doing unnecessary DNS checks for localhost. The underlying code in python is different for python3 so the hack is no longer necessary. Given that, its better to reunify the codebase --- tools/roslaunch/env-hooks/10.roslaunch.bat | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/tools/roslaunch/env-hooks/10.roslaunch.bat b/tools/roslaunch/env-hooks/10.roslaunch.bat index caaffb71d4..0ecfe9dc24 100644 --- a/tools/roslaunch/env-hooks/10.roslaunch.bat +++ b/tools/roslaunch/env-hooks/10.roslaunch.bat @@ -1,15 +1,5 @@ REM roslaunch/env-hooks/10.roslaunch.bat -:: workaround Python 2 xmlrpc performance issue -:: https://stackoverflow.com/questions/2617615/slow-python-http-server-on-localhost -:: use IP address instead to avoid unnecessary DNS lookups. if "%ROS_MASTER_URI%" == "" ( - set ROS_MASTER_URI=http://127.0.0.1:11311 -) - -:: it is discourage to set ROS_IP and ROS_HOSTNAME at the same time. -if "%ROS_IP%" == "" ( - if "%ROS_HOSTNAME%" == "" ( - set ROS_IP=127.0.0.1 - ) + set ROS_MASTER_URI=http://localhost:11311 )