Skip to content

Commit

Permalink
Merge branch 'timestamp-binlog' of https://github.com/Qihoo360/pika i…
Browse files Browse the repository at this point in the history
…nto timestamp-binlog
  • Loading branch information
wenduo committed Jul 12, 2016
2 parents db08342 + 2425fdf commit 8af2c07
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/pika_server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ void PikaServer::MayUpdateSlavesMap(int64_t sid, int32_t hb_fd) {
if (iter->sid == sid) {
iter->hb_fd = hb_fd;
iter->stage = SLAVE_ITEM_STAGE_TWO;
LOG(INFO) << "New Master-Slave connection established successfully, Slave host: " << iter->ip_port;
break;
}
iter++;
Expand Down Expand Up @@ -440,6 +441,7 @@ void PikaServer::PlusMasterConnection() {
// two connection with master has been established
repl_state_ = PIKA_REPL_CONNECTED;
master_connection_ = 2;
LOG(INFO) << "Master-Slave connection established successfully";
}
}
}
Expand Down

0 comments on commit 8af2c07

Please sign in to comment.