Full/incremental log updates.

packages/console-app/src/containers/panels/signal/SignalLog.js

@@ -7,32 +7,40 @@ import { useQuery } from '@apollo/react-hooks';
 
 import SIGNAL_LOG from '../../../gql/signal_log.graphql';
 
-import { ConsoleContext, useQueryStatusReducer } from '../../../hooks';
+import { ConsoleContext } from '../../../hooks';
 
 import Log from '../../../components/Log';
 
 const MAX_LINES = 1000;
-const oldLines = [];
+const logBuffer = [];
 
 const SignalLog = () => {
   const { config } = useContext(ConsoleContext);
-  const data = useQueryStatusReducer(useQuery(SIGNAL_LOG, {
+  const { data, refetch, startPolling, stopPolling } = useQuery(SIGNAL_LOG, {
-    pollInterval: config.api.intervalLog,
+    variables: { incremental: false }
-    variables: { first: oldLines.length === 0 }
+  });
-  }));
+
   if (!data) {
     return null;
   }
 
-  const newLines = JSON.parse(data.signal_log.json);
+  const { incremental, lines } = JSON.parse(data.signal_log.json);
-  oldLines.push(...newLines);
+
-  if (oldLines.length > MAX_LINES) {
+  if (!incremental) {
-    oldLines.splice(0, oldLines.length - MAX_LINES);
+    stopPolling();
+    refetch({ incremental: true });
+    startPolling(config.api.intervalLog);
+  }
+
+  logBuffer.push(...lines);
+  if (logBuffer.length > MAX_LINES) {
+    logBuffer.splice(0, logBuffer.length - MAX_LINES);
   }
 
   return (
-    <Log log={oldLines.slice(0)}/>
+    <Log log={logBuffer.slice(0)} />
   );
-};
+}
+;
 
 export default SignalLog;

packages/console-app/src/containers/panels/signal/Signaling.js

@@ -39,7 +39,6 @@ const useStyles = makeStyles(() => ({
 const Signal = () => {
   const classes = useStyles();
   const [tab, setTab] = useState(TAB_STATUS);
-  const [type, setType] = useState();
 
   return (
     <Panel

packages/console-app/src/containers/panels/wns/WNSLog.js

@@ -7,29 +7,40 @@ import { useQuery } from '@apollo/react-hooks';
 
 import WNS_LOG from '../../../gql/wns_log.graphql';
 
-import { ConsoleContext, useQueryStatusReducer } from '../../../hooks';
+import { ConsoleContext } from '../../../hooks';
 
 import Log from '../../../components/Log';
 
 const MAX_LINES = 1000;
-const oldLines = [];
+const logBuffer = [];
 
 const WNSLog = () => {
   const { config } = useContext(ConsoleContext);
-  const data = useQueryStatusReducer(useQuery(WNS_LOG, { pollInterval: config.api.intervalLog }));
+  const { data, refetch, startPolling, stopPolling } = useQuery(WNS_LOG, {
+    variables: { incremental: false }
+  });
+
   if (!data) {
     return null;
   }
 
-  const newLines = JSON.parse(data.wns_log.json);
+  const { incremental, lines } = JSON.parse(data.signal_log.json);
-  oldLines.push(...newLines);
+
-  if (oldLines.length > MAX_LINES) {
+  if (!incremental) {
-    oldLines.splice(0, oldLines.length - MAX_LINES);
+    stopPolling();
+    refetch({ incremental: true });
+    startPolling(config.api.intervalLog);
+  }
+
+  logBuffer.push(...lines);
+  if (logBuffer.length > MAX_LINES) {
+    logBuffer.splice(0, logBuffer.length - MAX_LINES);
   }
 
   return (
-    <Log log={oldLines.slice(0)} />
+    <Log log={logBuffer.slice(0)} />
   );
-};
+}
+;
 
 export default WNSLog;

packages/console-app/src/resolvers.js

@@ -105,7 +105,7 @@ export const createResolvers = config => {
           timestamp: timestamp(),
           log: []
         };
-      },
+      }
     }
   };
 };

packages/console-server/src/resolvers/index.js

@@ -7,8 +7,9 @@ import defaultsDeep from 'lodash.defaultsdeep';
 
 import { ipfsResolvers } from './ipfs';
 import { systemResolvers } from './system';
-import { logResolvers } from "./log";
+import { logResolvers } from './log';
 
+// eslint-disable-next-line
 const log = debug('dxos:console:server:resolvers');
 
 /**

packages/console-server/src/resolvers/log.js

@@ -37,7 +37,7 @@ const getLogCache = (name) => {
     _caches.set(name, cache);
   }
   return cache;
-}
+};
 
 const getLogs = async (name, incremental = false, lines = 100) => {
   const command = 'wire';
@@ -54,38 +54,38 @@ const getLogs = async (name, incremental = false, lines = 100) => {
 export const logResolvers = {
   Query: {
     wns_log: async (_, { incremental }) => {
-      const logs = await getLogs('wns-lite', incremental);
+      const lines = await getLogs('wns-lite', incremental);
       return {
         timestamp: new Date().toUTCString(),
-        json: JSON.stringify(logs)
+        json: JSON.stringify({ incremental, lines })
       };
     },
     signal_log: async (_, { incremental }) => {
-      const logs = await getLogs('signal', incremental);
+      const lines = await getLogs('signal', incremental);
       return {
         timestamp: new Date().toUTCString(),
-        json: JSON.stringify(logs)
+        json: JSON.stringify({ incremental, lines })
       };
     },
     ipfs_log: async (_, { incremental }) => {
-      const logs = await getLogs('ipfs', incremental);
+      const lines = await getLogs('ipfs', incremental);
       return {
         timestamp: new Date().toUTCString(),
-        json: JSON.stringify(logs)
+        json: JSON.stringify({ incremental, lines })
       };
     },
     ipfs_swarm_log: async (_, { incremental }) => {
-      const logs = await getLogs('ipfs-swarm-connect', incremental);
+      const lines = await getLogs('ipfs-swarm-connect', incremental);
       return {
         timestamp: new Date().toUTCString(),
-        json: JSON.stringify(logs)
+        json: JSON.stringify({ incremental, lines })
       };
     },
     app_log: async (_, { incremental }) => {
-      const logs = await getLogs('app', incremental);
+      const lines = await getLogs('app', incremental);
       return {
         timestamp: new Date().toUTCString(),
-        json: JSON.stringify(logs)
+        json: JSON.stringify({ incremental, lines })
       };
     }
   }