self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-13 22:12:50 +02:00
Code Issues Releases Activity

Remove old log entries

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-16 17:20:25 +01:00
parent c2ba2105ff
commit f600689323
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReactNativeClient/lib/components/screens/log.js
View File

@@ -48,7 +48,7 @@ class LogScreenComponent extends BaseScreenComponent {
}; };
return ( return (
<View style={{flexDirection: 'row', paddingLeft: 1, paddingRight: 1, paddingTop:0, paddingBottom:0 }}> <View style={{flexDirection: 'row', paddingLeft: 1, paddingRight: 1, paddingTop:0, paddingBottom:0 }}>
<Text style={style}>{time.formatMsToLocal(item.timestamp, 'MM-DDTHH:mm') + ': ' + item.message}</Text> <Text style={style}>{time.formatMsToLocal(item.timestamp, 'MM-DDTHH:mm:ss') + ': ' + item.message}</Text>
</View> </View>
); );
} }

19
ReactNativeClient/lib/logger.js
View File

@@ -9,6 +9,7 @@ class Logger {
this.targets_ = []; this.targets_ = [];
this.level_ = Logger.LEVEL_ERROR; this.level_ = Logger.LEVEL_ERROR;
this.fileAppendQueue_ = [] this.fileAppendQueue_ = []
this.lastDbCleanup_ = time.unixMs();
} }
static fsDriver() { static fsDriver() {
@@ -111,7 +112,23 @@ class Logger {
target.vorpal.log(...object); target.vorpal.log(...object);
} else if (target.type == 'database') { } else if (target.type == 'database') {
let msg = this.objectsToString(...object); let msg = this.objectsToString(...object);
target.database.exec('INSERT INTO logs (`source`, `level`, `message`, `timestamp`) VALUES (?, ?, ?, ?)', [target.source, level, msg, time.unixMs()]);
let queries = [{
sql: 'INSERT INTO logs (`source`, `level`, `message`, `timestamp`) VALUES (?, ?, ?, ?)',
params: [target.source, level, msg, time.unixMs()],
}];
const now = time.unixMs();
if (now - this.lastDbCleanup_ > 1000 * 60 * 60) {
this.lastDbCleanup_ = now;
const dayKeep = 14;
queries.push({
sql: 'DELETE FROM logs WHERE `timestamp` < ?',
params: [now - 1000 * 60 * 60 * 24 * dayKeep],
});
}
target.database.transactionExecBatch(queries);
} }
} }
} }