Changeset 2255:3cbca4485663

Timestamp:

08/26/08 19:27:43 (3 months ago)

Author:

dunker@…

Branch:

default

Message:

add servermode config knob to enable/disable cloud server

Files:

• gozerbot/generic.py (modified) (2 diffs)
• gozerbot/net/cloud.py (modified) (1 diff)
• gozerbot/rest/client.py (modified) (1 diff)
• gozerplugs/plugs/cloud.py (modified) (2 diffs)

gozerbot/generic.py

@@ -374 +374 @@
         if mod and descr in mod:
             descr = mod
+        else:
+            descr = "%s - %s -" % (mod, descr)
         outtxt = "[%s %s] (%s) %s\n" % (dmy(t), uurminsec(t), descr, txt)
         sys.stdout.write(outtxt)
@@ -413 +415 @@
     result = ""
     for i in trace:
-        fname = i[0].split(os.sep)[-1]
+        fname = i[0]
         linenr = i[1]
         func = i[2]

gozerbot/net/cloud.py

@@ -83 +83 @@
         if persist:
             self.persist(name, url)
-        rlog(10, whichmodule(), 'added %s node <%s>' % (name, url))
+        rlog(10, url, 'added %s node <%s>' % (name, url))
         return self.nodes[url]
 

gozerbot/rest/client.py

@@ -126 +126 @@
             except ValueError:
                 pass
-            rlog(10, self.name, 'RestClient error: %s' % str(excvalue))
             self.error = excvalue
         else:

gozerplugs/plugs/cloud.py

@@ -27 +27 @@
 cfg.define('disable', [])
 cfg.define('booturl', 'http://gozerbot.org/')
+cfg.define('servermode', 0)
 
 waitre = re.compile(' wait (\d+)', re.I)
@@ -75 +76 @@
         return 1
     try:
-        server = RestServerAsync((cfg.get('host'), cfg.get('port')), \
+        if cfg.get('servermode'):
+            server = RestServerAsync((cfg.get('host'), cfg.get('port')), \
 RestRequestHandler)
-        if server:
-            server.start()
-            rlog(10, 'cloud', 'running at %s:%s' % (cfg.get('host'), cfg.get('port')))
-            server.addhandler('/gozernet/+ping/', 'GET', ping_GET) 
-            server.addhandler('/gozernet/nodes/', 'GET', nodes_GET)
-            server.addhandler('/gozernet/+join/', 'POST', join_POST)
-            server.addhandler('/gozernet/+auth/', 'POST', auth_POST)
-            for mount in cfg.get('disable'):
-                server.disable(mount)
-            cloud.start(cfg.get('booturl'))
-            start_new_thread(asyncore.loop, (), {'use_poll': True })
-            rlog(10, 'cloud', 'total of %s nodes' % size())
+            if server:
+                server.start()
+                rlog(10, 'cloud', 'running at %s:%s' % (cfg.get('host'), cfg.get('port')))
+                server.addhandler('/gozernet/+ping/', 'GET', ping_GET)
+                server.addhandler('/gozernet/nodes/', 'GET', nodes_GET)
+                server.addhandler('/gozernet/+join/', 'POST', join_POST)
+                server.addhandler('/gozernet/+auth/', 'POST', auth_POST)
+                for mount in cfg.get('disable'):
+                    server.disable(mount)
+                cloud.start(cfg.get('booturl'))
+                start_new_thread(asyncore.loop, (), {'use_poll': True })
+                rlog(10, 'cloud', 'total of %s nodes' % size())
     except Exception, ex:
         handle_exception()