From c865b22eeeb93c77f068fcb5ce55647ef4463af6 Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Tue, 16 Aug 2011 15:24:00 +0200 Subject: minor --- gearman/psWorker.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gearman/psWorker.py') 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" -- cgit v1.2.3-55-g7522