Changeset 2267:f475f0ece862

Timestamp:

08/27/08 05:53:08 (3 months ago)

Author:

dunker@…

Branch:

default

Message:

move asyncore.loop into RestClientAsync?

Location:

gozerbot

Files:

• net/client.py (modified) (2 diffs)
• net/cloud.py (modified) (6 diffs)
• rest/client.py (modified) (2 diffs)

gozerbot/net/client.py

@@ -1 @@
-# gozerbot/net/server.py
+# gozerbot/net/client.py
 #
 # 
@@ -9 +9 @@
 class Client(RestClientAsync):
 
-    def get(self):
-        self.sendget()
-
     def auth(self, userhost, perm):
         kwargs = {}

gozerbot/net/cloud.py

@@ -12 +12 @@
 from gozerbot.datadir import datadir
 from gozerbot.contrib.simplejson import dumps
-import asyncore, time, os
+import asyncore, time, os, random
 
 state = PersistState(datadir + os.sep + 'cloud')
 state.define('nodes', [])
 state.define('names', {})
+
+CloudMap = {}
 
 class Node(object):
@@ -39 +41 @@
         self.client = Client(self.url + mount, self.name).addcb(cb)
         self.client.get()
+        return self.client
 
     def dopost(self, mount, cb, *args, **kwargs):
         self.client = Client(self.url + mount, self.name).addcb(cb)
         self.client.post(**kwargs)
+        return self.client
 
 class Cloud(object):
@@ -89 +93 @@
             self.add(name, url)
         self.boot(regname, regport, booturl)
-            
+
     def persist(self, name, url):
         self.startup.set('start', name, url)
@@ -132 +136 @@
         for url, node in self.nodes.iteritems():
             node.doget(mount, *args, **kwargs)
-        start_new_thread(asyncore.loop, (), {'use_poll': True })
 
     def dopost(self, mount, *args, **kwargs):
         for url, node in self.nodes.iteritems():
             node.dopost(mount, *args, **kwargs)
-        start_new_thread(asyncore.loop, (), {'use_poll': True })
 
     def getnodes(self):
@@ -157 +159 @@
         client = Client(url + '/gozernet/+join').addcb(cb)
         client.post(name=regname, port=regport)
+        CloudMap[url + str(random.random())] = client
 
     def joinall(self, regname, regport):
@@ -192 +195 @@
                 gnode = self.add(node[0], node[1])
                 gnode.synced = time.time()
-        Client('%s/gozernet/nodes/' % url).addcb(cb).get()
+        client = Client('%s/gozernet/nodes/' % url).addcb(cb)
+        CloudMap[url + str(random.random())] = client
+        client.get()
 
     def size(self):

gozerbot/rest/client.py

@@ -11 +11 @@
 from httplib import InvalidURL
 from urlparse import urlparse
-import socket, asynchat, urllib, sys, thread, re
+import socket, asynchat, urllib, sys, thread, re, asyncore
 
 restlock = thread.allocate_lock()
@@ -234 +234 @@
         self.start()
         self.push(s)
+        asyncore.loop()
 
     def sendpost(self, postdata):