[1996] in Moira Commits
/svn/moira r4135 - trunk/moira/incremental/route-server
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Fri Aug 23 13:19:59 2013
Date: Fri, 23 Aug 2013 13:19:51 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201308231719.r7NHJpbK005095@drugstore.mit.edu>
To: moira-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2013-08-23 13:19:51 -0400 (Fri, 23 Aug 2013)
New Revision: 4135
Modified:
trunk/moira/incremental/route-server/route-server.incr
Log:
Always push state to route server, rather than just doing it if the state has changed.
Modified: trunk/moira/incremental/route-server/route-server.incr
===================================================================
--- trunk/moira/incremental/route-server/route-server.incr 2013-08-22 21:30:42 UTC (rev 4134)
+++ trunk/moira/incremental/route-server/route-server.incr 2013-08-23 17:19:51 UTC (rev 4135)
@@ -120,21 +120,17 @@
if ($before_address ne $after_address) {
# If it did, consider before and after states independently.
- if ($before_address ne "unassigned" && $before_option > 0) {
+ if ($before_address ne "unassigned") {
# Delete the address that's no longer in use.
update_route_server("none", $before_state, $before_address);
}
- if ($after_address ne "unassigned" && $after_option > 0) {
+ if ($after_address ne "unassigned") {
update_route_server($after_state, "none", $after_address);
}
} else {
- # Address didn't change, did our status?
- if ($before_option != $after_option) {
- # If it's different, just look at after state to decide what to do.
- if ($after_address ne "unassigned") {
- update_route_server($after_state, $before_state, $after_address);
- }
+ if ($after_address ne "unassigned") {
+ update_route_server($after_state, $before_state, $after_address);
}
}
}
