2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Adjusted Prime95 osTicket report

Browse source 
* Post report regardless of result
This commit is contained in:
2Shirt 2018-09-29 13:25:10 -06:00
parent 824c184d59
commit 0fae4128ed
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
.bin/Scripts/functions/hw_diags.py
View file

@ -979,39 +979,35 @@ def run_mprime(ticket_number):
update_progress() update_progress()
# Build osTicket report # Build osTicket report
if TESTS['Prime95']['Status'] not in ['Unknown', 'Aborted']: report = ['Prime95 ({}):'.format(TESTS['Prime95']['Status'])]
report = ['System {} Prime95 testing.'.format( log_path = '{}/prime.log'.format(global_vars['LogDir'])
'FAILED' if TESTS['Prime95']['NS'] else 'passed')] try:
report.append('') with open(log_path, 'r') as f:
report.append('Prime95 log:') for line in f.readlines():
log_path = '{}/prime.log'.format(global_vars['LogDir']) line = line.strip()
try: r = re.search('(completed \d+ tests.*)', line, re.IGNORECASE)
with open(log_path, 'r') as f: if r:
for line in f.readlines(): report.append(r.group(1))
line = line.strip() except:
r = re.search('(completed \d+ tests.*)', line, re.IGNORECASE) report.append('ERROR: Failed to read log.')
if r: report.append('')
report.append(r.group(1)) report.append('Final temps:')
except: log_path = '{}/Final Temps.log'.format(global_vars['LogDir'])
report.append('ERROR: Failed to read log.') try:
report.append('') with open(log_path, 'r') as f:
report.append('Final temps:') for line in f.readlines():
log_path = '{}/Final Temps.log'.format(global_vars['LogDir']) line = line.strip()
try: if not line:
with open(log_path, 'r') as f: # Stop after CPU temp(s)
for line in f.readlines(): break
line = line.strip() report.append(line)
if not line: except:
# Stop after CPU temp(s) report.append('ERROR: Failed to read log.')
break
report.append(line)
except:
report.append('ERROR: Failed to read log.')
# Upload osTicket report # Upload osTicket report
osticket_post_reply( osticket_post_reply(
ticket_id=ticket_number, ticket_id=ticket_number,
response='\n'.join(report)) response='\n'.join(report))
# Done # Done
run_program('tmux kill-pane -a'.split()) run_program('tmux kill-pane -a'.split())