• R/O
  • SSH
  • HTTPS

o2on: Commit


Commit MetaInfo

Revision175 (tree)
Zeit2009-09-30 18:07:22
Autornawota

Log Message

RecheckIPがうまく動いていなかったバグを修正

Ändern Zusammenfassung

Diff

--- trunk/opy2on/lib/o2on_job.py (revision 174)
+++ trunk/opy2on/lib/o2on_job.py (revision 175)
@@ -172,18 +172,17 @@
172172 self.glob.logger.log("GETIP", inst)
173173 else:
174174 if r:
175- if not prof.mynode.ip:
176- ip = o2on_node.e2ip(r[:8])
177- if not regLocalIP.match(ip):
175+ ip = o2on_node.e2ip(r[:8])
176+ if not regLocalIP.match(ip):
177+ if o2on_config.ReCheckIP == None:
178+ self.finish = True
179+ else:
180+ self.sec = o2on_config.ReCheckIP * 60
181+ if prof.mynode.ip != ip:
182+ logger.popup("GETIP","Got Global IP %s" % ip)
178183 prof.mynode.ip = ip
179- if o2on_config.ReCheckIP == None:
180- self.finish = True
181- else:
182- self.sec = o2on_config.ReCheckIP * 60
183- logger.popup("GETIP","Got Global IP %s" % ip)
184- nodes.add_node(n)
185- break
186- else: break
184+ nodes.add_node(n)
185+ break
187186
188187 class AskNodeCollectionThread(JobThread):
189188 def __init__(self, g):
Show on old repository browser