Added Log Levels according to API Response

DiamondLightSource · May 9, 2024 · e72e322 · e72e322
1 parent ee52b1d
commit e72e322
Showing 1 changed file with 16 additions and 30 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -76,7 +76,7 @@ function App() {
         {
           query: {
             type: "elasticsearch",
-            query_string: "application_name:gda",
+            query_string: "beamline:i15 AND application_name:gda",
           },
           timerange: {
             from: 300,
@@ -181,8 +181,9 @@ function getMessage(logging: JSON): undefined | getMessageReturn {
             );
             host.push(logs[msg]["message"]["source"])
             app_name.push(logs[msg]["message"]["application_name"]); 
-            const text = logs[msg]["message"]["message"];
-            const [debug_level, log_message,level] = logLevel(text);
+            const level = logs[msg]["message"]["level"];
+            const log_message = logs[msg]["message"]["full_message"];
+            const debug_level = getLogLevel(level);
             debug.push(debug_level);
             message.push(log_message);
             log_level.push(level);
@@ -195,33 +196,18 @@ function getMessage(logging: JSON): undefined | getMessageReturn {
   }
 }
 
-function logLevel(text: string): [string, string, number] {
-  const debug_levels: {[key: string]: number} = {
-    "EMERG":0,
-    "PANIC":0,
-    "ALERT":1,
-    "CRIT":2,
-    "ERROR":3, 
-    "WARN":4, 
-    "NOTICE":5, 
-    "INFO":6,
-    "DEBUG":7,};
-  const words = text.split(/\s+/);
-  const firstWord = words[0] || '';  
-  const restOfText = words.slice(2).join(' ');
-  let debug = "";
-  let message = "";
-  let level_val:number = 0;
-  if (firstWord in debug_levels) {
-    debug = firstWord;
-    message = restOfText;
-    level_val = debug_levels[firstWord];
-  } else {
-    debug = "UNKNOWN";
-    message = text;
-    level_val = 7;
-  }
-  return [debug, message, level_val];
+function getLogLevel(level_val:number): string {
+  const log_levels: {[key: number]: string} = {
+    0:"EMERG",
+    1:"ALERT",
+    2:"CRIT",
+    3:"ERROR", 
+    4:"WARN", 
+    5:"NOTICE", 
+    6:"INFO",
+    7:"DEBUG",};
+  let level = log_levels[level_val] || "UNKNOWN";
+  return level;
 }
 async function readFile(): Promise<string> {
   const filePath = "src/token.txt";