Skip to content

Commit 0722b65

Browse files
committed
Merge branch 'master' into simple-kubernetes-manager
2 parents 8a0386c + ffab94a commit 0722b65

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

villas/controller/components/managers/villas_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def reconcile(self):
5454
except Exception as e:
5555
self.change_to_error('failed to reconcile',
5656
exception=str(e),
57-
args=e.args)
57+
args=str(e.args))
5858

5959
@property
6060
def status(self):

villas/controller/components/managers/villas_relay.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,13 @@ def reconcile(self):
9393
def status(self):
9494
status = super().status
9595

96-
status['status']['villas_relay_version'] = self._status.get('version')
96+
try:
97+
version = self._status.get('version')
98+
status['status']['villas_relay_version'] = version
99+
except Exception as e:
100+
self.change_to_error('failed to get version from VILLASrelay',
101+
exception=str(e),
102+
args=str(e.args))
97103

98104
return status
99105

0 commit comments

Comments
 (0)