x/scalpels
Code Issues Proposed changes

fix task stop

Browse Source 
there are some codes should in client side, but I put in agent(server)
side before

Change-Id: I3ca3bedd6f67d7994f7011bd85aa2c8fc6fa7403
This commit is contained in:
Kun Huang 2015-11-11 11:51:22 +08:00
parent fe44498986
commit 89a11930d0
4 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scalpels/agents/server.py
View File

@ -45,29 +45,15 @@ class TaskEndpoint(object):
LOWEST = 8 LOWEST = 8
def get_last_task(self): def get_last_task(self):
# XXX put it tu utils? # XXX put it utils?
last_task = db_api.task_get_last() last_task = db_api.task_get_last()
return last_task return last_task
def stop_task(self, ctx): def stop_task(self, ctx, uuid):
uuid = ctx.get("uuid")
last = ctx.get("last")
if last and uuid:
raise ValueError("can't assign last and uuid togther")
elif not last and not uuid:
task = self.get_last_task()
elif last:
task = self.get_last_task()
elif uuid and len(uuid) < self.LOWEST:
print "at least %d to find a task" % self.LOWEST
return
else:
# len(uuid) > LOWEST
task = db_api.task_get(uuid, fuzzy=True)
print "command stop: %s" % ctx print "command stop: %s" % ctx
print "task: <%s>" % task.uuid print "task: <%s>" % uuid
task = db_api.task_get(uuid)
for pid in task.pids: for pid in task.pids:
p = psutil.Process(int(pid)) p = psutil.Process(int(pid))
p.send_signal(signal.SIGINT) p.send_signal(signal.SIGINT)

17
scalpels/cli/actions/stop.py
View File

@ -12,4 +12,19 @@ def get_last_task():
return last_task return last_task
def run(config): def run(config):
agent_api.stop_task(config) uuid = config.get("uuid")
last = config.get("last")
if last and uuid:
raise ValueError("can't assign last and uuid togther")
elif not last and not uuid:
task = agent_api.get_latest_task()
elif last:
task = agent_api.get_latest_task()
elif uuid and len(uuid) < LOWEST:
print "at least %d to find a task" % LOWEST
return
else:
# len(uuid) > LOWEST
task = agent_api.get_task(uuid, fuzzy=True)
agent_api.stop_task(task["uuid"])

4
scalpels/cli/api.py
View File

@ -15,8 +15,8 @@ class API(object):
def start_tracers(self, tracers): def start_tracers(self, tracers):
rpcapi.start_tracers(tracers=tracers) rpcapi.start_tracers(tracers=tracers)
def stop_task(self, config): def stop_task(self, uuid):
rpcapi.stop_task(config) rpcapi.stop_task(uuid=uuid)
def get_task(self, uuid, fuzzy=False): def get_task(self, uuid, fuzzy=False):
return rpcapi.get_task(uuid=uuid, fuzzy=fuzzy) return rpcapi.get_task(uuid=uuid, fuzzy=fuzzy)

4
scalpels/cli/rpcapi.py
View File

@ -13,8 +13,8 @@ class RPCAPI(object):
def start_tracers(self, ctxt={}, tracers=None): def start_tracers(self, ctxt={}, tracers=None):
self._client.cast(ctxt, "start_tracers", tracers=tracers) self._client.cast(ctxt, "start_tracers", tracers=tracers)
def stop_task(self, ctxt={}): def stop_task(self, ctxt={}, uuid=None):
self._client.cast(ctxt, "stop_task") self._client.cast(ctxt, "stop_task", uuid=uuid)
def get_task(self, ctxt={}, uuid=None, fuzzy=False): def get_task(self, ctxt={}, uuid=None, fuzzy=False):
return self._client.call(ctxt, "get_task", uuid=uuid, fuzzy=fuzzy) return self._client.call(ctxt, "get_task", uuid=uuid, fuzzy=fuzzy)