fix(log): display render log in main log
This commit is contained in:
parent
349eedee0a
commit
1acc6fafb4
@ -80,6 +80,34 @@ injectTapEventPlugin();
|
|||||||
|
|
||||||
//registerServiceWorker();
|
//registerServiceWorker();
|
||||||
|
|
||||||
|
// override log to main process
|
||||||
|
const consoleLog = console.log
|
||||||
|
console.log = (...log) => {
|
||||||
|
window.torrentSocket.emit('log', ...log)
|
||||||
|
consoleLog(...log)
|
||||||
|
}
|
||||||
|
const consoleError = console.error
|
||||||
|
console.error = (...log) => {
|
||||||
|
let type = 'logE'
|
||||||
|
|
||||||
|
if(log[0] && log[0].startsWith('Warning:'))
|
||||||
|
type = 'log'
|
||||||
|
if(log[0] && log[0].includes('MaxListenersExceededWarning:'))
|
||||||
|
type = 'log'
|
||||||
|
|
||||||
|
window.torrentSocket.emit(type, ...log)
|
||||||
|
consoleError(...log)
|
||||||
|
}
|
||||||
|
|
||||||
|
window.onerror = function (msg, url, line, col, error) {
|
||||||
|
if(!error || !error.stack)
|
||||||
|
console.error(msg, 'at', url + ':' + line)
|
||||||
|
else
|
||||||
|
console.error(error.stack)
|
||||||
|
|
||||||
|
return true; // same as preventDefault
|
||||||
|
};
|
||||||
|
|
||||||
let loadersCount = 0;
|
let loadersCount = 0;
|
||||||
let appReady = false;
|
let appReady = false;
|
||||||
window.customLoader = (func, onLoading, onLoaded) => {
|
window.customLoader = (func, onLoading, onLoaded) => {
|
||||||
|
@ -23,7 +23,6 @@ export default class ConfigPage extends Page {
|
|||||||
loadSettings() {
|
loadSettings() {
|
||||||
window.torrentSocket.emit('config', window.customLoader((options) => {
|
window.torrentSocket.emit('config', window.customLoader((options) => {
|
||||||
this.options = options;
|
this.options = options;
|
||||||
console.log(this.options)
|
|
||||||
this.forceUpdate();
|
this.forceUpdate();
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,6 @@ export default class RecentTorrents extends Component {
|
|||||||
window.torrentSocket.emit('feed', window.customLoader((data) => {
|
window.torrentSocket.emit('feed', window.customLoader((data) => {
|
||||||
if(data) {
|
if(data) {
|
||||||
this.torrents = data;
|
this.torrents = data;
|
||||||
console.log(data)
|
|
||||||
this.forceUpdate();
|
this.forceUpdate();
|
||||||
}
|
}
|
||||||
}))
|
}))
|
||||||
|
@ -42,8 +42,6 @@ const router = (page, callback, dontClearRemember) => {
|
|||||||
{
|
{
|
||||||
params[pg.args[i]] = p[i]
|
params[pg.args[i]] = p[i]
|
||||||
}
|
}
|
||||||
console.log(params)
|
|
||||||
|
|
||||||
pg.callback({
|
pg.callback({
|
||||||
params
|
params
|
||||||
})
|
})
|
||||||
@ -65,7 +63,6 @@ const router = (page, callback, dontClearRemember) => {
|
|||||||
|
|
||||||
window.router = router;
|
window.router = router;
|
||||||
window.routerOpenPrev = () => {
|
window.routerOpenPrev = () => {
|
||||||
console.log(history)
|
|
||||||
if(history.length < 2)
|
if(history.length < 2)
|
||||||
return
|
return
|
||||||
history.pop() // last page
|
history.pop() // last page
|
||||||
|
@ -48,6 +48,13 @@ module.exports = function (send, recive, dataDirectory, version, env)
|
|||||||
{
|
{
|
||||||
this.initialized = (async () =>
|
this.initialized = (async () =>
|
||||||
{
|
{
|
||||||
|
recive('log', (...log) => {
|
||||||
|
logT('gui', ...log)
|
||||||
|
})
|
||||||
|
|
||||||
|
recive('logE', (...log) => {
|
||||||
|
logTE('gui', ...log)
|
||||||
|
})
|
||||||
|
|
||||||
let torrentsId = 1;
|
let torrentsId = 1;
|
||||||
let filesId = 1;
|
let filesId = 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user