1
0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-07-13 01:20:24 +02:00
This commit is contained in:
Kelly Brazil
2021-09-24 08:52:39 -07:00
parent a4d45b653f
commit 486282b985

View File

@ -113,7 +113,7 @@ def _process(proc_data):
ts = jc.utils.timestamp(f'{proc_data["timestamp"]} {proc_data["timezone"]}')
proc_data['epoch'] = ts.naive
proc_data['epoch_utc'] = ts.utc
return proc_data
@ -155,12 +155,12 @@ def parse(data, raw=False, quiet=False, ignore_exceptions=False):
# detect output type
if not procs and not disk and line.startswith('procs'):
procs = True
tstamp = True if '-timestamp-' in line else False
tstamp = '-timestamp-' in line
continue
if not procs and not disk and line.startswith('disk'):
disk = True
tstamp = True if '-timestamp-' in line else False
tstamp = '-timestamp-' in line
continue
@ -170,7 +170,7 @@ def parse(data, raw=False, quiet=False, ignore_exceptions=False):
tz = line.strip().split()[-1] if tstamp else None
continue
elif 'swpd' in line and 'free' in line and 'inact' in line and 'active' in line:
if 'swpd' in line and 'free' in line and 'inact' in line and 'active' in line:
buff_cache = False
tz = line.strip().split()[-1] if tstamp else None
continue
@ -227,6 +227,6 @@ def parse(data, raw=False, quiet=False, ignore_exceptions=False):
}
yield stream_success(output_line, ignore_exceptions) if raw else stream_success(_process(output_line), ignore_exceptions)
except Exception as e:
yield stream_error(e, ignore_exceptions, line)