Loading cloudcontrol/node/host/__init__.py +13 −11 Original line number Diff line number Diff line Loading @@ -307,7 +307,7 @@ class Handler(BasePlugin): conn.create_tunnel(label=label, endpoint=sock) @pass_connection def script_run(self, conn, sha1, script, owner, *args): def script_run(self, conn, sha1, script, owner, batch=None, *args): # retrive script if not here filename = os.path.join(self.scripts_dir, sha1) if not os.access(filename, os.X_OK): Loading @@ -330,7 +330,8 @@ class Handler(BasePlugin): 'Could not write script to repository: %s', script) raise return self.jobs_manager.spawn(ScriptJob, owner, settings=dict( return self.jobs_manager.spawn(ScriptJob, owner, batch=batch, settings=dict( script=script, filename=filename, args=args, Loading Loading @@ -377,14 +378,15 @@ class Handler(BasePlugin): plugin.uninstall() self.tag_db['__main__']['plugins'].update_value() def plugin_run(self, name, method, owner, **kwargs): def plugin_run(self, name, method, owner, batch=None, **kwargs): if name not in self.plugins: raise KeyError('Plugin %r is not running' % name) try: func = self.plugins[name].methods[method] except KeyError: raise KeyError('Unknown method %r' % method) return self.jobs_manager.spawn(PluginMethodJob, owner, settings=dict( return self.jobs_manager.spawn(PluginMethodJob, owner, batch=batch, settings=dict( plugin_name=name, method_name=method, method=func, Loading Loading
cloudcontrol/node/host/__init__.py +13 −11 Original line number Diff line number Diff line Loading @@ -307,7 +307,7 @@ class Handler(BasePlugin): conn.create_tunnel(label=label, endpoint=sock) @pass_connection def script_run(self, conn, sha1, script, owner, *args): def script_run(self, conn, sha1, script, owner, batch=None, *args): # retrive script if not here filename = os.path.join(self.scripts_dir, sha1) if not os.access(filename, os.X_OK): Loading @@ -330,7 +330,8 @@ class Handler(BasePlugin): 'Could not write script to repository: %s', script) raise return self.jobs_manager.spawn(ScriptJob, owner, settings=dict( return self.jobs_manager.spawn(ScriptJob, owner, batch=batch, settings=dict( script=script, filename=filename, args=args, Loading Loading @@ -377,14 +378,15 @@ class Handler(BasePlugin): plugin.uninstall() self.tag_db['__main__']['plugins'].update_value() def plugin_run(self, name, method, owner, **kwargs): def plugin_run(self, name, method, owner, batch=None, **kwargs): if name not in self.plugins: raise KeyError('Plugin %r is not running' % name) try: func = self.plugins[name].methods[method] except KeyError: raise KeyError('Unknown method %r' % method) return self.jobs_manager.spawn(PluginMethodJob, owner, settings=dict( return self.jobs_manager.spawn(PluginMethodJob, owner, batch=batch, settings=dict( plugin_name=name, method_name=method, method=func, Loading