Author: dmeyer
Date: Sat Oct 13 05:43:16 2007
New Revision: 2853
Log:
fix plugin loading
Modified:
trunk/beacon/src/server/parser.py
trunk/beacon/src/server/server.py
Modified: trunk/beacon/src/server/parser.py
==============================================================================
--- trunk/beacon/src/server/parser.py (original)
+++ trunk/beacon/src/server/parser.py Sat Oct 13 05:43:16 2007
@@ -63,7 +63,7 @@
kaa.metadata.MEDIA_DIRECTORY: 'dir'
}
-def load_plugins(db):
+def load_plugins(server, db):
"""
Load external plugins. Called by server on creating. The db object
is from kaa.beacon, not kaa.db.
@@ -72,8 +72,8 @@
for plugin in os.listdir(plugindir):
if not plugin.endswith('.py') or plugin == '__init__.py':
continue
- exec('import plugin.%s' % plugin)
- plugin.create(db, register)
+ exec('import plugins.%s as plugin' % plugin[:-3])
+ plugin.plugin_init(server, db, register)
def register(ext, function):
Modified: trunk/beacon/src/server/server.py
==============================================================================
--- trunk/beacon/src/server/server.py (original)
+++ trunk/beacon/src/server/server.py Sat Oct 13 05:43:16 2007
@@ -135,7 +135,7 @@
self._clients = []
# load parser plugins
- parser.load_plugins(self._db)
+ parser.load_plugins(self, self._db)
config.set_filename(os.path.join(dbdir, "config"))
config.load()
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
