Skip to content

Commit 9381a55

Browse files
[patch] fix logger message formating
1 parent 843cecb commit 9381a55

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

src/mas/devops/mas.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ def verifyMasInstance(dynClient: DynamicClient, instanceId: str) -> bool:
146146
except ResourceNotFoundError:
147147
# The MAS Suite CRD has not even been installed in the cluster
148148
return False
149-
except UnauthorizedError:
150-
logger.error("Error: Unable to verify MAS instance due to failed authorization: {e}")
149+
except UnauthorizedError as e:
150+
logger.error(f"Error: Unable to verify MAS instance due to failed authorization: {e}")
151151
return False
152152

153153

@@ -209,10 +209,10 @@ def waitForPVC(dynClient: DynamicClient, namespace: str, pvcName: str) -> bool:
209209
if pvc.status.phase == "Bound":
210210
foundReadyPVC = True
211211
else:
212-
logger.debug("Waiting 5s for PVC {pvcName} to be ready before checking again ...")
212+
logger.debug(f"Waiting 5s for PVC {pvcName} to be ready before checking again ...")
213213
sleep(5)
214214
except NotFoundError:
215-
logger.debug("Waiting 5s for PVC {pvcName} to be created before checking again ...")
215+
logger.debug(f"Waiting 5s for PVC {pvcName} to be created before checking again ...")
216216
sleep(5)
217217

218218
return foundReadyPVC
@@ -230,7 +230,7 @@ def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, stor
230230
if defaultStorageClasses.provider is not None:
231231
pvc.spec.storageClassName = defaultStorageClasses.rwo
232232
else:
233-
logger.error("Unable to set storageClassName in PVC {pvcName}.")
233+
logger.error(f"Unable to set storageClassName in PVC {pvcName}.")
234234
return False
235235

236236
pvcAPI.patch(body=pvc, namespace=namespace)
@@ -245,14 +245,14 @@ def patchPendingPVC(dynClient: DynamicClient, namespace: str, pvcName: str, stor
245245
if patchedPVC.status.phase == "Bound":
246246
foundReadyPVC = True
247247
else:
248-
logger.debug("Waiting 5s for PVC {pvcName} to be bound before checking again ...")
248+
logger.debug(f"Waiting 5s for PVC {pvcName} to be bound before checking again ...")
249249
sleep(5)
250250
except NotFoundError:
251-
logger.error("The patched PVC {pvcName} does not exist.")
251+
logger.error(f"The patched PVC {pvcName} does not exist.")
252252
return False
253253

254254
return foundReadyPVC
255255

256256
except NotFoundError:
257-
logger.error("PVC {pvcName} does not exist")
257+
logger.error(f"PVC {pvcName} does not exist")
258258
return False

src/mas/devops/ocp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ def waitForDeployment(dynClient: DynamicClient, namespace: str, deploymentName:
150150
# NoneType and int comparison TypeError
151151
foundReadyDeployment = True
152152
else:
153-
logger.debug("Waiting 5s for deployment {deploymentName} to be ready before checking again ...")
153+
logger.debug(f"Waiting 5s for deployment {deploymentName} to be ready before checking again ...")
154154
sleep(5)
155155
except NotFoundError:
156-
logger.debug("Waiting 5s for deployment {deploymentName} to be created before checking again ...")
156+
logger.debug(f"Waiting 5s for deployment {deploymentName} to be created before checking again ...")
157157
sleep(5)
158158
return foundReadyDeployment
159159

0 commit comments

Comments
 (0)