Explictly log PQping() failures

This commit is contained in:
Ian Barwick
2019-03-20 11:35:43 +09:00
parent 5cbaff8d0a
commit 58f55222d9

View File

@@ -4295,10 +4295,13 @@ is_server_available(const char *conninfo)
{ {
PGPing status = PQping(conninfo); PGPing status = PQping(conninfo);
log_verbose(LOG_DEBUG, "is_server_available(): ping status for %s is %i", conninfo, (int)status); log_verbose(LOG_DEBUG, "is_server_available(): ping status for \"%s\" is %s", conninfo, print_pqping_status(status));
if (status == PQPING_OK) if (status == PQPING_OK)
return true; return true;
log_warning(_("unable to ping \"%s\""), conninfo);
log_detail(_("PQping() returned \"%s\""), print_pqping_status(status));
return false; return false;
} }
@@ -4311,10 +4314,16 @@ is_server_available_params(t_conninfo_param_list *param_list)
false); false);
/* deparsing the param_list adds overhead, so only do it if needed */ /* deparsing the param_list adds overhead, so only do it if needed */
if (log_level == LOG_DEBUG) if (log_level == LOG_DEBUG || status != PQPING_OK)
{ {
char *conninfo_str = param_list_to_string(param_list); char *conninfo_str = param_list_to_string(param_list);
log_verbose(LOG_DEBUG, "is_server_available_params(): ping status for %s is %i", conninfo_str, (int)status); log_verbose(LOG_DEBUG, "is_server_available_params(): ping status for \"%s\" is %s", conninfo_str, print_pqping_status(status));
if (status != PQPING_OK)
{
log_warning(_("unable to ping \"%s\""), conninfo_str);
log_detail(_("PQping() returned \"%s\""), print_pqping_status(status));
}
pfree(conninfo_str); pfree(conninfo_str);
} }