wingo - in flumotion/trunk: . flumotion/admin/command

[flumotion-commit at lists.fluendo.com]

Author: wingo
Date: Mon Jun 11 17:01:08 2007
New Revision: 5149

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/admin/command/commands.py
Log:
	(do_workerinvoke): Fixor.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Mon Jun 11 17:01:08 2007
@@ -2,6 +2,7 @@
 
 	* flumotion/admin/command/commands.py (do_workerinvoke): Add new
 	command, invokes a function on a worker.
+	(do_workerinvoke): Fixor.
 
 2007-06-11  Michael Smith <msmith at fluendo.com>
 

Modified: flumotion/trunk/flumotion/admin/command/commands.py
==============================================================================
--- flumotion/trunk/flumotion/admin/command/commands.py	(original)
+++ flumotion/trunk/flumotion/admin/command/commands.py	Mon Jun 11 17:01:08 2007
@@ -254,13 +254,14 @@
     quit()
 do_invoke = defer_generator(do_invoke)
 
-def do_workerinvoke(model, quit, workerName, methodName, *args):
+def do_workerinvoke(model, quit, workerName, moduleName, methodName, *args):
     if args:
         args = _parse_typed_args(args[0], args[1:])
         if args is None:
             yield None
 
-    d = model.callRemote('workerCallRemote', workerName, methodName, *args)
+    d = model.callRemote('workerCallRemote', workerName, 'runFunction',
+                         moduleName, methodName, *args)
     yield d
 
     try:
@@ -428,6 +429,7 @@
             ('workerinvoke',
              'invoke a function on a worker',
              (('worker-name', str),
+              ('module-name', str),
               ('method-name', str),
               ('args', str, None, True)),
              do_workerinvoke),