o2on svn commit
o2on-****@lists*****
2009年 9月 30日 (水) 18:07:22 JST
Revision: 175
http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=175
Author: nawota
Date: 2009-09-30 18:07:22 +0900 (Wed, 30 Sep 2009)
Log Message:
-----------
RecheckIPがうまく動いていなかったバグを修正
Modified Paths:
--------------
trunk/opy2on/lib/o2on_job.py
Modified: trunk/opy2on/lib/o2on_job.py
===================================================================
--- trunk/opy2on/lib/o2on_job.py 2009-09-30 08:55:54 UTC (rev 174)
+++ trunk/opy2on/lib/o2on_job.py 2009-09-30 09:07:22 UTC (rev 175)
@@ -172,18 +172,17 @@
self.glob.logger.log("GETIP", inst)
else:
if r:
- if not prof.mynode.ip:
- ip = o2on_node.e2ip(r[:8])
- if not regLocalIP.match(ip):
- prof.mynode.ip = ip
- if o2on_config.ReCheckIP == None:
- self.finish = True
- else:
- self.sec = o2on_config.ReCheckIP * 60
+ ip = o2on_node.e2ip(r[:8])
+ if not regLocalIP.match(ip):
+ if o2on_config.ReCheckIP == None:
+ self.finish = True
+ else:
+ self.sec = o2on_config.ReCheckIP * 60
+ if prof.mynode.ip != ip:
logger.popup("GETIP","Got Global IP %s" % ip)
- nodes.add_node(n)
- break
- else: break
+ prof.mynode.ip = ip
+ nodes.add_node(n)
+ break
class AskNodeCollectionThread(JobThread):
def __init__(self, g):