Merge lp:~y-trudeau/mysql-mmm/mysql-mmm-NoKillPassiveOrNoNet into lp:~gryp/mysql-mmm/mysql-mmm-MoveSlavesMoreConsistent

Proposed by Kenny Gryp on 2011-05-25
Status: Merged
Approved by: Kenny Gryp on 2011-05-25
Approved revision: 148
Merged at revision: 151
Proposed branch: lp:~y-trudeau/mysql-mmm/mysql-mmm-NoKillPassiveOrNoNet
Merge into: lp:~gryp/mysql-mmm/mysql-mmm-MoveSlavesMoreConsistent
Diff against target: 13 lines (+2/-1)
1 file modified
lib/Monitor/Monitor.pm (+2/-1)
To merge this branch: bzr merge lp:~y-trudeau/mysql-mmm/mysql-mmm-NoKillPassiveOrNoNet
Reviewer Review Type Date Requested Status
Kenny Gryp Approve on 2011-05-25
Review via email: mp+62361@code.launchpad.net

Commit message

To post a comment you must log in.
Kenny Gryp (gryp) wrote :
review: Approve
Kenny Gryp (gryp) wrote :

OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/Monitor/Monitor.pm'
2--- lib/Monitor/Monitor.pm 2010-05-05 11:41:23 +0000
3+++ lib/Monitor/Monitor.pm 2011-05-25 19:41:13 +0000
4@@ -796,7 +796,8 @@
5
6 # Never send anything to agents if we are in PASSIVE mode
7 # Never send anything to agents if we have no network connection
8- return if ($self->is_passive || !$main::have_net);
9+ # Returns 1 for "Success" to avoid uneeded kills
10+ return 1 if ($self->is_passive || !$main::have_net);
11
12 # Determine active master if it was not passed
13 $master = $self->roles->get_active_master() unless (defined($master));

Subscribers

People subscribed via source and target branches

to all changes: