Skip to content
Snippets Groups Projects
Commit b95b7e5c authored by Pelle Koster's avatar Pelle Koster
Browse files

Fix provisioning of new folders, improve error reporting

parent 745fc3c1
No related branches found
No related tags found
No related merge requests found
......@@ -18,6 +18,10 @@ class BrianError(Exception):
client_message = self.DEFAULT_CLIENT_MESSAGE
self.client_message = client_message
def __str__(self):
message_parts = filter(None, (self.client_message, self.log_message))
return "\n".join(message_parts)
class BrianHTTPError(BrianError):
def __init__(self, response: Response | None = None, client_message=None):
......
......@@ -119,4 +119,4 @@ def request_with_retry(method, url, payload, request: TokenRequest):
time.sleep(1)
if error:
raise error
raise error from None
......@@ -326,10 +326,6 @@ def run_as_task(executor_, func, /, **kwargs):
global HAS_ERRORS
try:
func(**kwargs)
except BrianError as error:
HAS_ERRORS = True
message_parts = filter(None, (error.client_message, error.log_message))
logger.exception("\n".join(message_parts))
except Exception:
HAS_ERRORS = True
logger.exception("Error")
......@@ -479,7 +475,7 @@ def provision_folder(
logger.info(f"Creating folder {folder_uid}")
create_folder(organization.request, data=rendered)
all_folders[folder_uid] = {}
current_dashboards = all_folders[folder_uid]
current_dashboards = all_folders.get(folder_uid, {})
provisioned = set()
for dashboard in folder.dashboards:
......
......@@ -616,11 +616,6 @@ class DashboardFolder:
dashboards=self.make_dashboards(data, organization),
)
def render(self):
if not self.name:
return None
return {"title": self.name, "uid": self.name.replace(" ", "_")}
def make_dashboards(self, data: BrianData, organization: Organization):
return [
db
......@@ -651,6 +646,8 @@ class BoundFolder:
return self.name.replace(" ", "_")
def render(self):
if not self.name:
return None
return {"title": self.name, "uid": self.uid}
def is_excluded(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment