From 3e43964ff9adcfcc4cd3c7b4eed660be311490c7 Mon Sep 17 00:00:00 2001 From: Nicholas Pritchard <21726929@student.uwa.edu.au> Date: Thu, 7 Jul 2022 17:58:01 +0800 Subject: [PATCH 1/2] LIU-277 Changes colouring of expired and deleted drops. Text of deleted drops is now light, so they can be read. Colour of expired drops are now a dark grey. --- daliuge-engine/dlg/manager/web/static/css/progressBar.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daliuge-engine/dlg/manager/web/static/css/progressBar.css b/daliuge-engine/dlg/manager/web/static/css/progressBar.css index 7955e54cb..99a7316c1 100644 --- a/daliuge-engine/dlg/manager/web/static/css/progressBar.css +++ b/daliuge-engine/dlg/manager/web/static/css/progressBar.css @@ -19,7 +19,7 @@ } .node.expired :first-child, rect.expired { - fill: #700000; + fill: #888888; } .node.cancelled :first-child, rect.cancelled { @@ -31,7 +31,7 @@ } .node.deleted :first-child, rect.deleted { - color: #700000; + color: #cccccc; } /* AppDROP states */ From 497c3c49e4adb74e241a95936dafb2b38f408f7d Mon Sep 17 00:00:00 2001 From: Nicholas Pritchard <21726929@student.uwa.edu.au> Date: Thu, 7 Jul 2022 18:07:18 +0800 Subject: [PATCH 2/2] LIU-277 Changes default dlm cleanup period to 30 seconds (down from 100). --- daliuge-engine/dlg/manager/cmdline.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daliuge-engine/dlg/manager/cmdline.py b/daliuge-engine/dlg/manager/cmdline.py index 8052333e5..88d0437b1 100644 --- a/daliuge-engine/dlg/manager/cmdline.py +++ b/daliuge-engine/dlg/manager/cmdline.py @@ -361,8 +361,8 @@ def dlgNM(parser, args): parser.add_option( "--dlm-cleanup-period", type="float", - help="Time in seconds between background DLM drop automatic cleanups (defaults to 100)", - default=100 + help="Time in seconds between background DLM drop automatic cleanups (defaults to 30)", + default=30 ) parser.add_option( "--dlm-enable-replication",