chore(monitor): Backwards compatibility
This commit is contained in:
@@ -202,12 +202,18 @@ func (m *MonitorMgr) Remove(appName string) {
|
|||||||
}
|
}
|
||||||
for _, nat := range a.app.Nats {
|
for _, nat := range a.app.Nats {
|
||||||
parts := strings.Split(nat, ":")
|
parts := strings.Split(nat, ":")
|
||||||
if len(parts) != 2 {
|
switch len(parts) {
|
||||||
continue
|
case 3:
|
||||||
}
|
|
||||||
if err := natRule("D", a.app.Vip.Net.IP, m.ctrl.localIP, parts[0], parts[1], parts[2]); err != nil {
|
if err := natRule("D", a.app.Vip.Net.IP, m.ctrl.localIP, parts[0], parts[1], parts[2]); err != nil {
|
||||||
glog.Errorf("Failed to remove app: %s: %v", a.app.Name, err)
|
glog.Errorf("Failed to remove app: %s: %v", a.app.Name, err)
|
||||||
}
|
}
|
||||||
|
case 2:
|
||||||
|
if err := natRule("D", a.app.Vip.Net.IP, m.ctrl.localIP, parts[0], parts[1], parts[1]); err != nil {
|
||||||
|
glog.Errorf("Failed to remove app: %s: %v", a.app.Name, err)
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
continue
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
delete(m.monitors, appName)
|
delete(m.monitors, appName)
|
||||||
@@ -248,12 +254,18 @@ func (m *MonitorMgr) checkCond(am *appMon) error {
|
|||||||
}
|
}
|
||||||
for _, nat := range app.Nats {
|
for _, nat := range app.Nats {
|
||||||
parts := strings.Split(nat, ":")
|
parts := strings.Split(nat, ":")
|
||||||
if len(parts) != 2 {
|
switch len(parts) {
|
||||||
continue
|
case 3:
|
||||||
}
|
|
||||||
if err := natRule("A", app.Vip.Net.IP, m.ctrl.localIP, parts[0], parts[1], parts[2]); err != nil {
|
if err := natRule("A", app.Vip.Net.IP, m.ctrl.localIP, parts[0], parts[1], parts[2]); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
case 2:
|
||||||
|
if err := natRule("A", app.Vip.Net.IP, m.ctrl.localIP, parts[0], parts[1], parts[1]); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
continue
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if err := m.ctrl.Announce(app.Vip); err != nil {
|
if err := m.ctrl.Announce(app.Vip); err != nil {
|
||||||
return fmt.Errorf("Failed to announce route: %v", err)
|
return fmt.Errorf("Failed to announce route: %v", err)
|
||||||
@@ -315,10 +327,14 @@ func (m *MonitorMgr) CloseAll() {
|
|||||||
deleteLoopback(am.app.Vip.Net)
|
deleteLoopback(am.app.Vip.Net)
|
||||||
for _, nat := range am.app.Nats {
|
for _, nat := range am.app.Nats {
|
||||||
parts := strings.Split(nat, ":")
|
parts := strings.Split(nat, ":")
|
||||||
if len(parts) != 2 {
|
switch len(parts) {
|
||||||
|
case 3:
|
||||||
|
natRule("D", am.app.Vip.Net.IP, m.ctrl.localIP, parts[0], parts[1], parts[2])
|
||||||
|
case 2:
|
||||||
|
natRule("D", am.app.Vip.Net.IP, m.ctrl.localIP, parts[0], parts[1], parts[1])
|
||||||
|
default:
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
natRule("D", am.app.Vip.Net.IP, m.ctrl.localIP, parts[0], parts[1], parts[2])
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user