Changeset 2254:bacfcc1256ca for gozerbot/net/cloud.py

Timestamp:

08/26/08 17:37:16 (4 months ago)

Author:

dunker@…

Branch:

default

Message:

improve logging .. gozernet backup

Files:

• gozerbot/net/cloud.py (modified) (5 diffs)

gozerbot/net/cloud.py

@@ -5 +5 @@
 __copyright__ = 'this file is in the public domain'
 
-from gozerbot.generic import rlog
+from gozerbot.generic import rlog, whichmodule
 from gozerbot.persiststate import PersistState
 from gozerbot.net.client import Client
@@ -11 +11 @@
 from gozerbot.thr import start_new_thread
 from gozerbot.datadir import datadir
-from gozerbot.net.server import server
 from gozerbot.contrib.simplejson import dumps
 import asyncore, time, os
@@ -84 +83 @@
         if persist:
             self.persist(name, url)
-        rlog(10, 'net.cloud', 'added %s node <%s>' % (name, url))
+        rlog(10, whichmodule(), 'added %s node <%s>' % (name, url))
         return self.nodes[url]
 
-    def start(self):
-        self.boot()
+    def start(self, booturl=None):
+        self.boot(booturl)
         for name, url in self.startup['start'].iteritems():
             self.add(name, url)
-        self.joinall()
-
+            
     def persist(self, name, url):
         self.startup.set('start', name, url)
@@ -159 +157 @@
             client = Client("%s/gozernet/+join/" % url).addcb(cb)                
         else:
-            client = Client('http://213.196.7.59:10101/gozernet/+join/').addcb(cb)
+            client = Client('http://gozerbot.org:10101/gozernet/+join/').addcb(cb)
         client.add(name=name, port=port)
-
-    def joinall(self):
-        for item in self.nodes.values():
-            self.join(item.url)
-        start_new_thread(asyncore.loop, (), {'use_poll': True })
 
     def boot(self, node=None):
@@ -186 +179 @@
         def cb(client, result):
             if result.error:
-                rlog(10, self.url, "can't sync: %s" % result.error)
+                rlog(10, url, "can't sync: %s" % result.error)
                 return
             for node in result.data: