Skip to content

Commit 06c7695

Browse files
authored
chore(scheduler): move log lines to before a raise so DEBUG info is actually caught (#1067)
1 parent 8559fb0 commit 06c7695

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

rootfs/scheduler/resources/deployment.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ def create(self, namespace, name, image, entrypoint, command, **kwargs):
113113
url = self.api("/namespaces/{}/deployments", namespace)
114114
response = self.http_post(url, json=manifest)
115115
if self.unhealthy(response.status_code):
116+
self.log(namespace, 'template: {}'.format(json.dumps(manifest, indent=4)), 'DEBUG')
116117
raise KubeHTTPException(
117118
response,
118119
'create Deployment "{}" in Namespace "{}"', name, namespace
119120
)
120-
self.log(namespace, 'template used: {}'.format(json.dumps(manifest, indent=4)), 'DEBUG') # noqa
121121

122122
self.wait_until_updated(namespace, name)
123123
self.wait_until_ready(namespace, name, **kwargs)
@@ -131,7 +131,7 @@ def update(self, namespace, name, image, entrypoint, command, **kwargs):
131131
url = self.api("/namespaces/{}/deployments/{}", namespace, name)
132132
response = self.http_put(url, json=manifest)
133133
if self.unhealthy(response.status_code):
134-
self.log(namespace, 'template used: {}'.format(json.dumps(manifest, indent=4)), 'DEBUG') # noqa
134+
self.log(namespace, 'template: {}'.format(json.dumps(manifest, indent=4)), 'DEBUG')
135135
raise KubeHTTPException(response, 'update Deployment "{}"', name)
136136

137137
self.wait_until_updated(namespace, name)

rootfs/scheduler/resources/replicationcontroller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ def create(self, namespace, name, image, entrypoint, command, **kwargs):
5656
url = self.api("/namespaces/{}/replicationcontrollers", namespace)
5757
resp = self.http_post(url, json=manifest)
5858
if self.unhealthy(resp.status_code):
59+
self.log(namespace, 'template: {}'.format(json.dumps(manifest, indent=4)), 'DEBUG')
5960
raise KubeHTTPException(
6061
resp,
6162
'create ReplicationController "{}" in Namespace "{}"', name, namespace
6263
)
63-
self.log(namespace, 'manifest used: {}'.format(json.dumps(manifest, indent=4)), 'DEBUG') # noqa
6464

6565
self.wait_until_updated(namespace, name)
6666

0 commit comments

Comments
 (0)