Merge pull request #450 from lightninglabs/even-faster-logs

Even faster logs

Author: tanx

src/action/log.js

@@ -21,10 +21,10 @@ export function error(...args) {
 
 function pushLogs(message) {
   if (!_store) return;
-  const { logs } = _store;
-  logs.push(message);
-  if (logs.length > MAX_LOG_LENGTH) {
-    logs.splice(0, logs.length - MAX_LOG_LENGTH);
+  _store.logs += '\n' + message.replace(/\s+$/, '');
+  const len = _store.logs.length;
+  if (len > MAX_LOG_LENGTH) {
+    _store.logs = _store.logs.substring(len - MAX_LOG_LENGTH, len);
   }
 }
 

src/config.js

@@ -13,7 +13,7 @@ module.exports.PREFIX_URI = `${prefixName}:`;
 
 module.exports.DEFAULT_ROUTE = 'Welcome';
 module.exports.MIN_PASSWORD_LENGTH = 8;
-module.exports.MAX_LOG_LENGTH = 100;
+module.exports.MAX_LOG_LENGTH = 10000;
 
 module.exports.UNITS = {
   sat: { display: 'SAT', displayLong: 'Satoshi', denominator: 1 },

src/store.js

@@ -61,7 +61,7 @@ export class Store {
       paymentRequest: null,
       seedMnemonic: [],
       notifications: [],
-      logs: [],
+      logs: '',
 
       // Persistent data
       settings: {

src/view/cli.js

@@ -25,7 +25,7 @@ const CLIView = ({ store, nav }) => (
       <Title title="Logs" />
       <Button disabled onPress={() => {}} />
     </Header>
-    <LogOutput logs={store.logs.slice()} />
+    <LogOutput logs={store.logs} />
   </Background>
 );
 
@@ -55,12 +55,26 @@ const logStyles = StyleSheet.create({
 class LogOutput extends Component {
   constructor(props) {
     super(props);
+    this._refresh = true;
     this._ref = React.createRef();
   }
 
+  shouldComponentUpdate() {
+    const current = this._refresh;
+    this._refresh = false;
+    setTimeout(() => {
+      this._refresh = true;
+    }, 100);
+    if (!current) {
+      clearTimeout(this._tLast);
+      this._tLast = setTimeout(() => this.forceUpdate(), 500);
+    }
+    return current;
+  }
+
   get printLogs() {
     setTimeout(() => this._ref.current.scrollToEnd(), 50);
-    return this.props.logs.map(l => l.replace(/\s+$/, '')).join('\n');
+    return this.props.logs;
   }
 
   render() {
@@ -73,7 +87,7 @@ class LogOutput extends Component {
 }
 
 LogOutput.propTypes = {
-  logs: PropTypes.array.isRequired,
+  logs: PropTypes.string.isRequired,
 };
 
 export default observer(CLIView);

stories/screen.js

@@ -275,4 +275,4 @@ store.logs = [
   '[14:00:33.731] [info] lnd: 2018-06-28 14:00:33.730 [INF] LTND: Primary chain is set to: bitcoin',
   '[14:00:33.879] [info] lnd: 2018-06-28 14:00:33.879 [INF] BTCN: Loaded 1032 addresses from file /home/valentine/.config/lightning-app/lnd/data/chain/bitcoin/testnet/peers.json',
   '[14:00:33.893] [info] lnd: 2018-06-28 14:00:33.892 [INF] CMGR: DNS discovery failed on seed x49.seed.tbtc.petertodd.org: lookup x49.seed.tbtc.petertodd.org: No address associated with hostname',
-];
+].join('\n');

test/unit/action/log.spec.js

@@ -51,12 +51,12 @@ describe('Action Logs Unit Tests', () => {
 
     describe('constructor()', () => {
       it('should keep logs trimmed and keep the tail of the logs', () => {
-        for (var i = 0; i < 101; i++) {
+        for (var i = 0; i < 10001; i++) {
           ipcRendererStub.emit('logs', 'some-event', i.toString());
         }
-        expect(store.logs.length, 'to equal', 100);
-        expect(store.logs[0], 'to equal', '1');
-        expect(store.logs[99], 'to equal', '100');
+        const len = store.logs.length;
+        expect(store.logs.substring(len - 5, len), 'to equal', '10000');
+        expect(store.logs.length, 'to equal', 10000);
       });
     });
   });
@@ -69,7 +69,7 @@ describe('Action Logs Unit Tests', () => {
 
     describe('constructor()', () => {
       it('should append log on ipcRenderer logs event', () => {
-        expect(store.logs[0], 'to equal', 'some-arg');
+        expect(store.logs, 'to equal', '\nsome-arg');
       });
     });
 
@@ -94,7 +94,7 @@ describe('Action Logs Unit Tests', () => {
         log.error('foo', err);
         expect(console.error, 'was called with', 'foo', err);
         sandbox.restore();
-        expect(store.logs.length, 'to equal', 5);
+        expect(store.logs.length, 'to equal', 25);
         expect(ipcRenderer.send, 'was called with', 'log-error', ['foo', err]);
       });
     });