From c74d2da76628d5373e1fdd6dac2a919b56a3e19a Mon Sep 17 00:00:00 2001
From: Adam deRieux <aderieux@erad.com>
Date: Wed, 3 May 2023 20:45:26 +0000
Subject: [PATCH] Update check_tasks.sh
---
check_tasks.sh | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/check_tasks.sh b/check_tasks.sh
index 8b77900..11488ae 100755
--- a/check_tasks.sh
+++ b/check_tasks.sh
@@ -7,25 +7,24 @@ import subprocess
import os, os.path
def getQueue(queue):
- if queue == "Unscheduled":
+ if queue == "Physical":
DIR = '/home/medsrv/var/taskqueue'
queueResult = len([name for name in os.listdir(DIR) if os.path.isfile(os.path.join(DIR, name))])
else:
- queryString = "select count(TQCONTENT) from TaskQueue where TQQUEUE = '{}';".format(queue)
+ queryString = "select count(TQNAME) from TaskQueue where TQQUEUE = '{}';".format(queue)
queueResult = int(subprocess.check_output(['sudo', '-u', 'medsrv', '/home/medsrv/component/tools/sql.sh', queryString,'-N']).decode('utf-8').strip())
return queueResult
def getQueueInfo(queue):
- if queue == "Unscheduled":
- result = "No information on unscheduled tasks"
+ if queue == "Physical":
+ result = "No information on physical tasks"
else:
queryString = "select TQSCRIPTNAME as CMD, count(*) as N from TaskQueue where TQQUEUE = '{}' group by CMD;".format(queue)
result = subprocess.check_output(['sudo', '-u', 'medsrv', '/home/medsrv/component/tools/sql.sh', queryString,'-N']).decode('utf-8')
return result
-
parser = argparse.ArgumentParser()
-parser.add_argument('-q', '--queue', choices=['unscheduled', 'scheduled', 'retry', 'failed', 'suspended', 'delay', 'future' ], required=True)
+parser.add_argument('-q', '--queue', choices=['unprocessed','physical', 'scheduled', 'retry', 'failed', 'suspended', 'delay', 'future' ], required=True)
parser.add_argument('-w', '--warnlimit', type=int, default='500')
parser.add_argument('-c', '--critlimit', type=int, default='1000')
args = parser.parse_args()
@@ -61,4 +60,4 @@ elif numTasks > warn:
else:
print("{} ({}) is below the warning limit ({}) | 'tasks'={} {}".format(que.capitalize(), numTasks, warn, numTasks, taskPerfMetrics)) # Customized
print(additionalInfo)
- sys.exit(0)
\ No newline at end of file
+ sys.exit(0)
--
GitLab