From 11b74f5e99abaa93d97eeb38a8ea7cc7eff69833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Tue, 14 Jul 2020 14:43:47 +0200
Subject: [PATCH] FIX: fix renamed function
---
src/caosadvancedtools/serverside/helper.py | 1 -
src/caosadvancedtools/webui_formatter.py | 17 +++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/caosadvancedtools/serverside/helper.py b/src/caosadvancedtools/serverside/helper.py
index 360f2877..a09e6cfe 100644
--- a/src/caosadvancedtools/serverside/helper.py
+++ b/src/caosadvancedtools/serverside/helper.py
@@ -23,7 +23,6 @@ from __future__ import absolute_import
import argparse
import datetime
import json
-import logging
import sys
import caosdb as db
diff --git a/src/caosadvancedtools/webui_formatter.py b/src/caosadvancedtools/webui_formatter.py
index 848f3e39..c3c5381d 100644
--- a/src/caosadvancedtools/webui_formatter.py
+++ b/src/caosadvancedtools/webui_formatter.py
@@ -20,7 +20,7 @@
#
import logging
-from .serverside.helper import prefix_bootstrap
+from .serverside.helper import wrap_bootstrap_alert
class WebUI_Formatter(logging.Formatter):
@@ -67,7 +67,7 @@ class WebUI_Formatter(logging.Formatter):
self.counter += 1
if self.counter == self.max_elements:
- return prefix_bootstrap(
+ return wrap_bootstrap_alert(
"<b>Warning:</b> Due to the large number of messages, the "
"output is stopped here. You can see the full log "
" <a href='{}'>here</a>.".format(self.full_file),
@@ -80,15 +80,16 @@ class WebUI_Formatter(logging.Formatter):
text = text.replace("\t", r" "*4)
if record.levelno == logging.DEBUG:
- return prefix_bootstrap(msg, kind="info")
+ return wrap_bootstrap_alert(msg, kind="info")
elif record.levelno == logging.INFO:
- return prefix_bootstrap("<b>Info:</b> " + text, kind="info")
+ return wrap_bootstrap_alert("<b>Info:</b> " + text, kind="info")
elif record.levelno == logging.WARNING:
- return prefix_bootstrap("<b>Warning:</b> " + text, kind="warning")
+ return wrap_bootstrap_alert("<b>Warning:</b> " + text,
+ kind="warning")
elif record.levelno == logging.ERROR:
- return prefix_bootstrap("<b>ERROR:</b> " + text, kind="danger")
+ return wrap_bootstrap_alert("<b>ERROR:</b> " + text, kind="danger")
elif record.levelno == logging.CRITICAL:
- return prefix_bootstrap("<b>CRITICAL ERROR:</b> " + text,
- kind="danger")
+ return wrap_bootstrap_alert("<b>CRITICAL ERROR:</b> " + text,
+ kind="danger")
else:
raise Exception("unknown level")
--
GitLab