From c2311306f9dee3ae78d62aceca5d9d23d0276309 Mon Sep 17 00:00:00 2001 From: XuWei Date: Wed, 8 Nov 2017 20:24:02 -0500 Subject: [PATCH 1/2] modify error msg when login by 'curl' failed --- xCAT-server/lib/xcat/plugins/openbmc.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm index e3dbfffde..b92890289 100644 --- a/xCAT-server/lib/xcat/plugins/openbmc.pm +++ b/xCAT-server/lib/xcat/plugins/openbmc.pm @@ -586,7 +586,7 @@ sub process_request { foreach my $node (keys %node_info) { if (!$valid_nodes{$node}) { - xCAT::SvrUtils::sendmsg([1, $::RESPONSE_SERVICE_UNAVAILABLE], $callback, $node); + xCAT::SvrUtils::sendmsg([1, "Unavailable now, please try again later"], $callback, $node); $wait_node_num--; } else { $login_url = "$http_protocol://$node_info{$node}{bmc}/login"; From 47115a9141280f51914d362070cb0fc9796b5fd1 Mon Sep 17 00:00:00 2001 From: XuWei Date: Thu, 9 Nov 2017 19:56:02 -0500 Subject: [PATCH 2/2] modified depending on comments --- xCAT-server/lib/xcat/plugins/openbmc.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm index b92890289..ed76cc416 100644 --- a/xCAT-server/lib/xcat/plugins/openbmc.pm +++ b/xCAT-server/lib/xcat/plugins/openbmc.pm @@ -586,7 +586,7 @@ sub process_request { foreach my $node (keys %node_info) { if (!$valid_nodes{$node}) { - xCAT::SvrUtils::sendmsg([1, "Unavailable now, please try again later"], $callback, $node); + xCAT::SvrUtils::sendmsg([1, "BMC did not respond within 10 seconds, retry the command."], $callback, $node); $wait_node_num--; } else { $login_url = "$http_protocol://$node_info{$node}{bmc}/login";