mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-30 05:19:57 +00:00
Code Issues Releases Wiki Activity

Clean up startup logging

Browse Source 
Now we do boot logging to an array. We harvest it in the —verbose
command. We still need to provide a way to access the log in the
browser too.
This commit is contained in:
Jermolene 2014-05-15 18:50:14 +01:00
parent f9f8ad725b
commit 31e1088aa7
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
boot/boot.js
View File

@ -45,6 +45,11 @@ if($tw.node) {
/////////////////////////// Utility functions /////////////////////////// Utility functions
$tw.boot.log = function(str) {
$tw.boot.logMessages = $tw.boot.logMessages || [];
$tw.boot.logMessages.push(str);
}
/* /*
Check if an object has a property Check if an object has a property
*/ */
@ -1089,7 +1094,7 @@ $tw.Wiki.prototype.processSafeMode = function() {
// Find the overriding tiddlers // Find the overriding tiddlers
this.each(function(tiddler,title) { this.each(function(tiddler,title) {
if(self.isShadowTiddler(title)) { if(self.isShadowTiddler(title)) {
console.log(title); console.log(title);
overrides.push(title); overrides.push(title);
} }
}); });
@ -1754,18 +1759,19 @@ $tw.boot.executeNextStartupTask = function() {
if($tw.boot.isStartupTaskEligible(task)) { if($tw.boot.isStartupTaskEligible(task)) {
// Remove this task from the list // Remove this task from the list
$tw.boot.remainingStartupModules.splice(taskIndex,1); $tw.boot.remainingStartupModules.splice(taskIndex,1);
var s = ["Executing task:",task.name]; // Assemble log message
if(task.platforms) { var s = ["Startup task:",task.name];
s.push("platforms:",task.platforms.join(",")); if(task.platforms) {
} s.push("platforms:",task.platforms.join(","));
if(task.after) { }
s.push("after:",task.after.join(",")); if(task.after) {
} s.push("after:",task.after.join(","));
if(task.before) { }
s.push("before:",task.before.join(",")); if(task.before) {
} s.push("before:",task.before.join(","));
console.log(s.join(" ")); }
// Execute it $tw.boot.log(s.join(" "));
// Execute task
if(!$tw.utils.hop(task,"synchronous") || task.synchronous) { if(!$tw.utils.hop(task,"synchronous") || task.synchronous) {
task.startup(); task.startup();
if(task.name) { if(task.name) {

2
core/modules/commands/verbose.js
View File

@ -24,6 +24,8 @@ var Command = function(params,commander) {
Command.prototype.execute = function() { Command.prototype.execute = function() {
this.commander.verbose = true; this.commander.verbose = true;
// Output the boot message log
this.commander.streams.output.write("Boot log:\n " + $tw.boot.logMessages.join("\n ") + "\n");
return null; // No error return null; // No error
}; };