Clean up whitespace and comments

This commit is contained in:
Ian Barwick
2016-01-04 11:58:33 +09:00
parent 7b9df3ac8f
commit 490e12b1af

View File

@@ -693,7 +693,6 @@ standby_monitor(void)
log_err("%s\n", errmsg.data); log_err("%s\n", errmsg.data);
//terminate(ERR_DB_CON);
goto continue_monitoring_standby; goto continue_monitoring_standby;
} }
@@ -856,22 +855,21 @@ standby_monitor(void)
if (!check_connection(&my_local_conn, "standby", NULL)) if (!check_connection(&my_local_conn, "standby", NULL))
{ {
set_local_node_status(); set_local_node_status();
/* /*
* Let's continue checking, and if the postgres server on the * Let's continue checking, and if the postgres server on the
* standby comes back up, we will activate it again * standby comes back up, we will activate it again
*/ */
} }
break; break;
} }
} while (ret == -1); } while (ret == -1);
if (did_retry) if (did_retry)
{ {
/* /*
* There's a possible situation where the standby went down for some reason * There's a possible situation where the standby went down for some reason
* (maintanence for example) and is now up and maybe connected once again to * (maintenance for example) and is now up and maybe connected once again to
* the stream. If we set the local standby node as failed and it's now running * the stream. If we set the local standby node as failed and it's now running
* and receiving replication data, we should activate it again. * and receiving replication data, we should activate it again.
*/ */
@@ -1813,7 +1811,7 @@ set_local_node_status(void)
* Attempt to set the active record to the correct value. * Attempt to set the active record to the correct value.
* First * First
*/ */
if (!update_node_record_status(master_conn, if (!update_node_record_status(master_conn,
local_options.cluster_name, local_options.cluster_name,
node_info.node_id, node_info.node_id,
@@ -2272,5 +2270,3 @@ get_node_info(PGconn *conn, char *cluster, int node_id)
return node_info; return node_info;
} }