Add debugging to print printjobs, add additional termination check (#472)

This commit is contained in:
Ross Scroggs
2017-04-03 10:31:58 -07:00
committed by Jay Lee
parent c8c18497cc
commit 39193ae92f

View File

@ -2324,6 +2324,9 @@ def doPrintPrintJobs():
owner=owner, offset=offset, limit=limit) owner=owner, offset=offset, limit=limit)
checkCloudPrintResult(result) checkCloudPrintResult(result)
newJobs = result[u'range'][u'jobsCount'] newJobs = result[u'range'][u'jobsCount']
totalJobs = int(result[u'range'][u'jobsTotal'])
if GC_Values[GC_DEBUG_LEVEL] > 0:
sys.stderr.write(u'Debug: jobCount: {0}, jobLimit: {1}, jobsCount: {2}, jobsTotal: {3}\n'.format(jobCount, jobLimit, newJobs, totalJobs))
if newJobs == 0: if newJobs == 0:
break break
jobCount += newJobs jobCount += newJobs
@ -2340,6 +2343,8 @@ def doPrintPrintJobs():
job[u'updateTime'] = datetime.datetime.fromtimestamp(updateTime).strftime(u'%Y-%m-%d %H:%M:%S') job[u'updateTime'] = datetime.datetime.fromtimestamp(updateTime).strftime(u'%Y-%m-%d %H:%M:%S')
job[u'tags'] = u' '.join(job[u'tags']) job[u'tags'] = u' '.join(job[u'tags'])
addRowTitlesToCSVfile(flatten_json(job), csvRows, titles) addRowTitlesToCSVfile(flatten_json(job), csvRows, titles)
if jobCount >= totalJobs:
break
writeCSVfile(csvRows, titles, u'Print Jobs', todrive) writeCSVfile(csvRows, titles, u'Print Jobs', todrive)
def doPrintPrinters(): def doPrintPrinters():