From 4c5ad2121c78c0422271605dc6a3e5c3c8b279ad Mon Sep 17 00:00:00 2001
From: tmaeno <tmaeno@bnl.gov>
Date: Tue, 13 Jun 2023 14:51:52 +0200
Subject: [PATCH] cleanup for debug mode

---
 PandaPkgInfo.py                       | 2 +-
 pandaserver/jobdispatcher/Protocol.py | 2 +-
 pandaserver/taskbuffer/OraDBProxy.py  | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/PandaPkgInfo.py b/PandaPkgInfo.py
index a2528365b..fc3f07702 100644
--- a/PandaPkgInfo.py
+++ b/PandaPkgInfo.py
@@ -1 +1 @@
-release_version = "0.0.59"
+release_version = "0.0.60"
diff --git a/pandaserver/jobdispatcher/Protocol.py b/pandaserver/jobdispatcher/Protocol.py
index 9aa8ed8ee..2848d696a 100755
--- a/pandaserver/jobdispatcher/Protocol.py
+++ b/pandaserver/jobdispatcher/Protocol.py
@@ -281,7 +281,7 @@ def appendJob(self, job, siteMapperCache=None):
         if job.is_no_looping_check():
             self.data['loopingCheck'] = False
         # debug mode
-        if job.specialHandling is not None and 'debug' in job.specialHandling:
+        if job.is_debug_mode():
             self.data['debug'] = 'True'
         # event service or job cloning or fine-grained
         if EventServiceUtils.isJobCloningJob(job):
diff --git a/pandaserver/taskbuffer/OraDBProxy.py b/pandaserver/taskbuffer/OraDBProxy.py
index b6e4bf999..4e8fe3a71 100644
--- a/pandaserver/taskbuffer/OraDBProxy.py
+++ b/pandaserver/taskbuffer/OraDBProxy.py
@@ -2424,8 +2424,11 @@ def updateJobStatus(self,pandaID,jobStatus,param,updateStateChange=False,attempt
                         lockedby,jediTaskID,jobsetID,jobDispatcherErrorDiag,supErrorCode,eventService,batchID \
                         = res
                     # debug mode
-                    if specialHandling not in [None,''] and 'debug' in specialHandling:
-                        ret += 'debug,'
+                    if specialHandling:
+                        tmpJobSpec = JobSpec()
+                        tmpJobSpec.specialHandling = specialHandling
+                        if tmpJobSpec.is_debug_mode():
+                            ret += 'debug,'
                     # FIXME
                     #else:
                     #    ret += 'debugoff,'