~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svc/conntrack.in (kickpeers): Rename `map' variable.
[tripe]
/
svc
/
conntrack.in
diff --git
a/svc/conntrack.in
b/svc/conntrack.in
index
043c969
..
99491b1
100644
(file)
--- a/
svc/conntrack.in
+++ b/
svc/conntrack.in
@@
-361,7
+361,7
@@
def kickpeers():
## Find out which peer in the group ought to be active.
ip = None
## Find out which peer in the group ought to be active.
ip = None
- map = {}
+
state
map = {}
want = None
for t, p, n in pp:
if p is None or not upness:
want = None
for t, p, n in pp:
if p is None or not upness:
@@
-374,7
+374,7
@@
def kickpeers():
if upness and ip is None and \
ipq is not None and ipq.withinp(n):
if T._debug: print '# %s: SELECTED' % info
if upness and ip is None and \
ipq is not None and ipq.withinp(n):
if T._debug: print '# %s: SELECTED' % info
- map[t] = 'up'
+
state
map[t] = 'up'
select.append('%s=%s' % (g, t))
if t == 'down' or t.startswith('down/'):
want = None
select.append('%s=%s' % (g, t))
if t == 'down' or t.startswith('down/'):
want = None
@@
-382,14
+382,14
@@
def kickpeers():
want = t
ip = ipq
else:
want = t
ip = ipq
else:
- map[t] = 'down'
+
state
map[t] = 'down'
if T._debug: print '# %s: skipped' % info
## Shut down the wrong ones.
found = False
if T._debug: print '# %s: skipped' % info
## Shut down the wrong ones.
found = False
- if T._debug: print '# peer-map = %r' % map
+ if T._debug: print '# peer-map = %r' %
state
map
for p in peers:
for p in peers:
- what = map.get(p, 'leave')
+ what =
state
map.get(p, 'leave')
if what == 'up':
found = True
if T._debug: print '# peer %s: already up' % p
if what == 'up':
found = True
if T._debug: print '# peer %s: already up' % p