Changeset 2254:bacfcc1256ca

Timestamp:

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

Author:

dunker@…

Branch:

default

Message:

improve logging .. gozernet backup

Files:

• gozerbot/generic.py (modified) (2 diffs)
• gozerbot/net/cloud.py (modified) (5 diffs)
• gozerbot/net/server.py (deleted)
• gozerbot/rest/server.py (modified) (4 diffs)
• gozerplugs/plugs/cloud.py (modified) (5 diffs)

gozerbot/generic.py

@@ -302 +302 @@
     return name
 
+def whichmodule():
+    """ return plugin from which function is called """
+    try:
+        frame = sys._getframe(1)
+        plugfile = frame.f_back.f_code.co_filename[:-3].split('/')
+        lineno = frame.f_back.f_lineno
+        mod = []
+        for i in plugfile[::-1]:
+            mod.append(i)
+            if i == 'gozerplugs' or i == 'gozerbot':
+                break
+        modstr = '.'.join(mod[::-1]) + ':' + str(lineno)
+    except AttributeError:
+        modstr = None
+    del frame
+    return modstr
+
 def stripident(userhost):
     """ strip ident char from userhost """
@@ -354 +371 @@
         txt = str(txt)
         t = time.time()
-        outtxt = "[%s %s] (%s) %s\n" % (dmy(t), uurminsec(t), descr, \
+        mod = whichmodule()
+        if mod and descr in mod:
+            descr = mod
+        outtxt = "[%s %s] (%s) %s\n" % (dmy(t), uurminsec(t), descr, txt)
+        sys.stdout.write(outtxt)
+        sys.stdout.flush()
+        if not nofile and logfile:
+            rlogfile(level, descr, txt)
+        for cb in logcallbacks:
+            try:
+                cb(outtxt)
+            except Exception, ex:
+                handle_exception(log=False)
+
+def log(level, txt, nofile=False):
+    """ log text if level >= loglevel """
+    if not logging_enabled:
+        return
+    if level >= config['loglevel']:
+        txt = str(txt)
+        t = time.time()
+        outtxt = "[%s %s] (%s) %s\n" % (dmy(t), uurminsec(t), whichmodule(), \
 txt)
         sys.stdout.write(outtxt)
         sys.stdout.flush()
         if not nofile and logfile:
-            rlogfile(level, descr, txt)
+            rlogfile(level, outtxt, txt)
         for cb in logcallbacks:
             try:

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:

gozerbot/rest/server.py

@@ -34 +34 @@
         self.state.define('whitelist', [])
         self.state.define('blacklist', [])
+        self.state.define('disable', [])
         self.poll = select.poll()
         self.poll.register(self)
@@ -96 +97 @@
         rlog(10, self.name, '%s %s handler added' % (splitted, type))
 
+    def enable(self, what):
+        try:
+            self.state['disable'].remove(what)
+            rlog(10, self.name, 'enabled %s' % what)
+        except ValueError:
+            pass
+
+    def disable(self, what):
+        self.state['disable'].append(what)
+        rlog(10, self.name, 'enabled %s' % what)
+
     def do(self, request):
         """ do a request """
@@ -106 +118 @@
                 splitted.append(i)
         splitted = tuple(splitted)
+        if splitted not in self.state['allow']:
+            request.send_error(404)
+            return
         request.splitted = splitted
         request.value = None
@@ -247 +262 @@
 
 except ImportError:
-    rlog(10, 'restserver', 'no SSL detected .. see python-openssl')
+    rlog(10, 'rest.server', 'no SSL detected .. see python-openssl')
   

gozerplugs/plugs/cloud.py

@@ -10 +10 @@
 from gozerbot.plughelp import plughelp
 from gozerbot.net.cloud import cloud
-from gozerbot.net.server import serverinit, servershutdown
+from gozerbot.rest.server import RestServerAsync, RestRequestHandler
+from gozerbot.contrib.simplejson import dumps
 from gozerbot.persistconfig import PersistConfig
 from gozerbot.plugins import plugins
@@ -24 +25 @@
 cfg.define('name' , socket.getfqdn())
 cfg.define('port' , 10101)
+cfg.define('disable', [])
+cfg.define('booturl', 'http://gozerbot.org/')
 
 waitre = re.compile(' wait (\d+)', re.I)
-
 hp = "%s:%s" % (cfg.get('host'), cfg.get('port'))
 url = "http://%s" % hp
+server = None
 
 def nodes_GET(server, request):
@@ -68 +71 @@
 def init():
     """ init the cloud plugin """
+    global server
     if not cfg.get('enable'):
         return 1
     try:
-        server = serverinit(cfg.get('host'), cfg.get('port'))
-        time.sleep(1)
-        server.addhandler('/gozernet/nodes/', 'GET', nodes_GET)
-        server.addhandler('/gozernet/+ping/', 'GET', ping_GET) 
-        server.addhandler('/gozernet/+join/', 'POST', join_POST)
-        server.addhandler('/gozernet/+auth/', 'POST', auth_POST)
-        cloud.add(hp, url)
-        start_new_thread(asyncore.loop, (), {'use_poll': True })
-        rlog(10, 'cloud', 'total of %s nodes' % size())
+        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())
     except Exception, ex:
         handle_exception()
@@ -85 +94 @@
 def shutdown():
     """ shutdown the cloud plugin """
-    try:
-        servershutdown()
+    global server
+    if not server:
+        return 1
+    try:
+        server.stop = True
+        server.server_close()
+        time.sleep(2)
     except Exception, ex:
         handle_exception()
@@ -310 +324 @@
 cmnds.add('cloud-join', handle_cloudjoin, 'OPER')
 examples.add('cloud-join', 'join node with <name>' , 'net-join gozerbot')
+
+def handle_cloudallow(bot, ievent):
+    """ cloud-allow .. allow a server mountpoint """
+    if not cfg.get('enable'):
+        ievent.reply('cloud is not enabled')
+        return
+    if not ievent.rest:
+        ievent.missing('<server mount>')
+        return
+    server.enable(('gozernet', ievent.rest))
+    ievent.reply('%s allowed' % ievent.rest)
+ 
+cmnds.add('cloud-allow', handle_cloudallow, 'OPER')
+examples.add('cloud-allow', 'allow execution of a server mountpoint', \
+'cloud-allow join')
+
+def handle_clouddisallow(bot, ievent):
+    """ cloud-disallow .. disallow a mount point"""
+    if not cfg.get('enable'):
+        ievent.reply('cloud is not enabled')
+        return
+    if not ievent.rest:
+        ievent.missing('<server mount>')
+        return
+    server.disable(('gozernet', ievent.rest))
+    ievent.reply('%s disallowed' % ievent.rest)
+ 
+cmnds.add('cloud-disallow', handle_clouddisallow, 'OPER')
+examples.add('cloud-disallow', 'disallow execution of a server mountpoint', \
+'cloud-disallow join')