Merge pull request #136 from perfsonar/bug/type-error

fixes involving variable types and handling exceptions in agentctl
perfsonar · Sep 6, 2024 · 7308c85 · 7308c85
2 parents 5a04fd8 + 3d435df
commit 7308c85
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/psconfig/perfsonar-psconfig/bin/commands/agentctl b/psconfig/perfsonar-psconfig/bin/commands/agentctl
@@ -259,9 +259,13 @@ elif len(args.values) > 0:
     cli.print_msg("Successfully set {} in {}".format(args.prop, config_file))
 elif args.unset:
     #unset an option
-    del agent_conf.data[args.prop]
-    _save_and_validate(agent_conf, config_client, cli)
-    cli.print_msg("Successfully unset {} in {}".format(args.prop, config_file))
+    try:
+        del agent_conf.data[args.prop]
+        _save_and_validate(agent_conf, config_client, cli)
+        cli.print_msg("Successfully unset {} in {}".format(args.prop, config_file))
+    except KeyError:
+        cli.print_msg("{} was not set in {}. No action performed".format(args.prop, config_file))
+
 else:
     # print current value of property
     _print_prop(args.prop, agent_conf.data.get(args.prop, None), cli)
diff --git a/psconfig/perfsonar-psconfig/psconfig/base_agent.py b/psconfig/perfsonar-psconfig/psconfig/base_agent.py
@@ -146,7 +146,7 @@ def run(self):
             check_interval = None
 
             try:
-                check_interval = duration_to_seconds(agent_conf.check_interval()) 
+                check_interval = int(duration_to_seconds(agent_conf.check_interval()))
             except Exception as e:
                 self.logger.error(self.logf.format("Error parsing check-interval. Defaulting to " + str(self.check_interval_seconds) + " seconds: {}".format(e)))
                 pass

diff --git a/psconfig/perfsonar-psconfig/psconfig/pscheduler/agent.py b/psconfig/perfsonar-psconfig/psconfig/pscheduler/agent.py
@@ -57,7 +57,7 @@ def _run_start(self, agent_conf):
             task_min_ttl_seconds = None
 
             try:
-                task_min_ttl_seconds = duration_to_seconds(agent_conf.task_min_ttl())
+                task_min_ttl_seconds = int(duration_to_seconds(agent_conf.task_min_ttl()))
             except Exception as e:
                 self.logger.error(self.logf.format("Error parsing task-min-ttl. Defaulting to " + str(self.task_min_ttl_seconds) + " seconds: {}".format(e)))
 

diff --git a/psconfig/perfsonar-psconfig/psconfig/utilities/iso8601.py b/psconfig/perfsonar-psconfig/psconfig/utilities/iso8601.py
@@ -2,7 +2,8 @@
 import isodate
 
 def duration_to_seconds(iso):
-    """Convert an ISO 8601 string to a timdelta and return total seconds"""
+    """Convert an ISO 8601 string to a timdelta and return total seconds
+        Returns float"""
     try:
         duration = isodate.parse_duration(iso)
     except isodate.isoerror.ISO8601Error: