removing system log

mxcubeweb/logging_handler.py

@@ -1,5 +1,4 @@
 import logging
-import traceback
 
 
 class MX3LoggingHandler(logging.handlers.BufferingHandler):
@@ -13,10 +12,6 @@ def connect():
             pass
 
     def _record_to_json(self, record):
-        if record.exc_info:
-            stack_trace = "".join(traceback.format_exception(*record.exc_info))
-        else:
-            stack_trace = ""
         try:
             record.asctime
         except AttributeError:
@@ -26,14 +21,10 @@ def _record_to_json(self, record):
             "message": record.getMessage(),
             "severity": record.levelname,
             "timestamp": record.asctime,
-            "logger": record.name,
-            "stack_trace": stack_trace,
         }
 
     def emit(self, record):
-        if record.name != "geventwebsocket.handler":
+        if record.name == "user_level_log":
             record_dict = self._record_to_json(record)
             super().emit(record_dict)
             self.server.emit("log_record", record_dict, namespace="/logging")
-        else:
-            super().emit(record)

ui/src/actions/logger.js

@@ -1,7 +1,3 @@
 export function addLogRecord(data) {
   return { type: 'ADD_LOG_RECORD', data };
 }
-
-export function setLogPage(page) {
-  return { type: 'SET_PAGE_LOGGING', page };
-}

ui/src/components/App.jsx

@@ -10,7 +10,6 @@ import LoginContainer from '../containers/LoginContainer';
 import SampleViewContainer from '../containers/SampleViewContainer';
 import SampleListViewContainer from '../containers/SampleListViewContainer';
 import EquipmentContainer from '../containers/EquipmentContainer';
-import LoggerContainer from '../containers/LoggerContainer';
 import RemoteAccessContainer from '../containers/RemoteAccessContainer';
 import HelpContainer from '../containers/HelpContainer';
 import Main from './Main';
@@ -48,10 +47,6 @@ const router = createBrowserRouter([
             path: 'equipment',
             element: <EquipmentContainer />,
           },
-          {
-            path: 'logging',
-            element: <LoggerContainer />,
-          },
           {
             path: 'remoteaccess',
             element: <RemoteAccessContainer />,

ui/src/components/MXNavbar/MXNavbar.jsx

@@ -63,9 +63,6 @@ function MXNavbar() {
             <Nav.Link as={NavLink} className={styles.navLink} to="/equipment">
               Equipment
             </Nav.Link>
-            <Nav.Link as={NavLink} className={styles.navLink} to="/logging">
-              System log
-            </Nav.Link>
           </Nav>
           <Nav className={styles.subNav}>
             <Nav.Link as={NavLink} className={styles.navLink} to="/help">

ui/src/components/Notify/UserMessage.jsx

@@ -17,11 +17,6 @@ export default class UserMessage extends React.Component {
       include = false;
     }
 
-    // Message is not for this component, skip !
-    if (this.props.target && this.props.target !== message.logger) {
-      include = false;
-    }
-
     // Filter function returns true for messages to exclude, skip !
     if (this.props.filter && this.props.filter(message)) {
       include = false;

ui/src/containers/SampleQueueContainer.jsx

@@ -191,10 +191,7 @@ class SampleQueueContainer extends React.Component {
               />
               Log messages:
             </div>
-            <UserMessage
-              messages={this.props.logRecords}
-              target="user_level_log"
-            />
+            <UserMessage messages={this.props.logRecords} />
           </div>
         </div>
       </div>

ui/src/reducers/logger.js

@@ -1,6 +1,5 @@
 const INITIAL_STATE = {
   logRecords: [],
-  activePage: 0,
 };
 
 function loggerReducer(state = INITIAL_STATE, action = {}) {
@@ -11,9 +10,6 @@ function loggerReducer(state = INITIAL_STATE, action = {}) {
         logRecords: [...state.logRecords.slice(-100), action.data],
       };
     }
-    case 'SET_PAGE_LOGGING': {
-      return { ...state, activePage: action.page };
-    }
     case 'SET_INITIAL_STATE': {
       return { ...state, logRecords: [...action.data.logger] };
     }