joshua
/
websockify
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logging: add Util.get_logging(), canvas clearing. 

Only clear canvas if log level is not debug instead of using
'#__debug__' in the URL.
This commit is contained in:
Joel Martin 2010-09-22 17:11:57 -05:00
parent 57c7903f60
commit c1eba48f79
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/rfb.js
View File

@ -366,7 +366,7 @@ updateState = function(state, statusMsg) {
if (canvas && canvas.getContext()) {
canvas.stop();
if (! /__debug__$/i.test(document.location.href)) {
if (Util.get_logging() !== 'debug') {
canvas.clear();
}
}

16
include/util.js
View File

@ -59,7 +59,16 @@ Array.prototype.push32 = function (num) {
* Logging/debug routines
*/
Util._log_level = 'warn';
Util.init_logging = function (level) {
if (typeof level === 'undefined') {
Util._log_level = (document.location.href.match(
/logging=([A-Za-z0-9\._\-]*)/) ||
['', Util._log_level])[1];
level = Util._log_level;
} else {
Util._log_level = level;
}
if (typeof window.console === "undefined") {
if (typeof window.opera !== "undefined") {
window.console = {
@ -86,10 +95,11 @@ Util.init_logging = function (level) {
throw("invalid logging type '" + level + "'");
}
};
Util.get_logging = function () {
return Util._log_level;
}
// Initialize logging level
Util.init_logging( (document.location.href.match(
/logging=([A-Za-z0-9\._\-]*)/) ||
['', 'warn'])[1] );
Util.init_logging();
Util.dirObj = function (obj, depth, parent) {
var i, msg = "", val = "";