Merge pull request #234 from girder/logging-bad-list-cli

Improve logging when list_cli fails

slicer_cli_web/image_job.py

@@ -298,10 +298,15 @@ def getCliData(name, client, job):
         cli_dict = getDockerOutput(name, '--list_cli', client)
         # contains nested dict
         # {<cliname>:{type:<type>}}
-        if isinstance(cli_dict, bytes):
-            cli_dict = cli_dict.decode('utf8')
-        cli_dict = json.loads(cli_dict)
-
+        try:
+            if isinstance(cli_dict, bytes):
+                cli_dict = cli_dict.decode('utf8')
+            cli_dict = json.loads(cli_dict)
+        except Exception:
+            job = Job().updateJob(
+                job,
+                log='Failed to parse cli list.  Output of list_cli was\n%r\n' % cli_dict)
+            raise
         for key, info in cli_dict.items():
             desc_type = info.get('desc-type', 'xml')
             cli_desc = getDockerOutput(name, [key, f'--{desc_type}'], client)

slicer_cli_web/models/exceptions.py

@@ -10,7 +10,7 @@ def __str__(self):
         if isinstance(self.imageName, list):
             return self.message + ' (image names [' + ','.join(self.imageName) + '])'
         elif isinstance(self.imageName, str):
-            return self.message + ' (image name: ' + self.imageName + ' )'
+            return self.message + ' (image name: ' + self.imageName + ')'
         else:
             return self.message