summaryrefslogtreecommitdiffstats
path: root/gearman/psWorker.py
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-16 15:24:00 +0200
committerBjörn Geiger2011-08-16 15:24:00 +0200
commitc865b22eeeb93c77f068fcb5ce55647ef4463af6 (patch)
tree6f158ca8525c4c03c62c2a28fc4bcc2a67bcfd36 /gearman/psWorker.py
parentminor (diff)
downloadpoolctrl-c865b22eeeb93c77f068fcb5ce55647ef4463af6.tar.gz
poolctrl-c865b22eeeb93c77f068fcb5ce55647ef4463af6.tar.xz
poolctrl-c865b22eeeb93c77f068fcb5ce55647ef4463af6.zip
minor
Diffstat (limited to 'gearman/psWorker.py')
-rw-r--r--gearman/psWorker.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/gearman/psWorker.py b/gearman/psWorker.py
index b9ffb9a..db90a66 100644
--- a/gearman/psWorker.py
+++ b/gearman/psWorker.py
@@ -55,9 +55,9 @@ def psWorker(worker, job):
ret['ps'] = []
for l in xrange(len(lines)):
rowentries = lines[l].split()
- if len(rowentries) == 11:
- (pid, user, pr, ni, virt, res, shr_s, cpu, mem, time, command) = rowentries
- data = {'pid': pid, 'user': user, 'pr': pr, 'ni': ni, 'virt': virt, 'shr_s': shr_s, 'cpu': cpu, 'mem': mem, 'time': time, 'command': command}
+ if len(rowentries) == 14:
+ (f, s, uid, pid, ppid, c, pri, ni, addr, sz, wchan, tty, time, cmd) = rowentries
+ data = {'f': f, 's': s, 'uid': uid, 'pid': pid, 'ppid': ppid, 'c': c, 'pri': pri, 'ni': ni, 'addr': addr, 'sz': sz, 'wchan': wchan, 'tty': tty, 'time': time, 'cmd': cmd}
ret['ps'].append(data)
print 'remote command successful.'
return json.dumps(ret) + "\n"