suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added prefs extensions.zotero.debug.log and extensions.zotero.debug.level to determine terminal logging, defaulting to off

Browse Source
This commit is contained in:
Dan Stillman 2006-11-28 19:34:56 +00:00
parent 9a7c18ed5e
commit 2ccdd3a51d
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
chrome/content/zotero/xpcom/zotero.js
View File

@ -24,8 +24,6 @@ const ZOTERO_CONFIG = {
GUID: 'zotero@chnm.gmu.edu', GUID: 'zotero@chnm.gmu.edu',
DB_FILE: 'zotero.sqlite', DB_FILE: 'zotero.sqlite',
DB_REBUILD: false, // erase DB and recreate from schema DB_REBUILD: false, // erase DB and recreate from schema
DEBUG_LOGGING: true,
DEBUG_TO_CONSOLE: true, // dump debug messages to console rather than (much slower) Debug Logger
REPOSITORY_URL: 'http://www.zotero.org/repo', REPOSITORY_URL: 'http://www.zotero.org/repo',
REPOSITORY_CHECK_INTERVAL: 86400, // 24 hours REPOSITORY_CHECK_INTERVAL: 86400, // 24 hours
REPOSITORY_RETRY_INTERVAL: 3600 // 1 hour REPOSITORY_RETRY_INTERVAL: 3600 // 1 hour
@ -36,6 +34,8 @@ const ZOTERO_CONFIG = {
*/ */
var Zotero = new function(){ var Zotero = new function(){
var _initialized = false; var _initialized = false;
var _debugLogging;
var _debugLevel;
var _shutdown = false; var _shutdown = false;
var _localizedStringBundle; var _localizedStringBundle;
@ -87,6 +87,9 @@ var Zotero = new function(){
// Load in the preferences branch for the extension // Load in the preferences branch for the extension
Zotero.Prefs.init(); Zotero.Prefs.init();
_debugLogging = Zotero.Prefs.get('debug.log');
_debugLevel = Zotero.Prefs.get('debug.level');
// Load in the extension version from the extension manager // Load in the extension version from the extension manager
var nsIUpdateItem = Components.interfaces.nsIUpdateItem; var nsIUpdateItem = Components.interfaces.nsIUpdateItem;
var gExtensionManager = var gExtensionManager =
@ -245,14 +248,12 @@ var Zotero = new function(){
/* /*
* Debug logging function * Debug logging function
* *
* Uses DebugLogger extension available from http://mozmonkey.com/debuglogger/ * Uses prefs e.z.debug.log and e.z.debug.level (restart required)
* if available, otherwise the console (in which case boolean browser.dom.window.dump.enabled
* must be created and set to true in about:config)
* *
* Defaults to log level 3 if level not provided * Defaults to log level 3 if level not provided
*/ */
function debug(message, level) { function debug(message, level) {
if (!ZOTERO_CONFIG['DEBUG_LOGGING']){ if (!_debugLogging){
return false; return false;
} }
@ -264,7 +265,14 @@ var Zotero = new function(){
level = 3; level = 3;
} }
if (!ZOTERO_CONFIG['DEBUG_TO_CONSOLE']){ // If level above debug.level value, don't display
if (level > _debugLevel){
return false;
}
// Note: DebugLogger extension is old and no longer supported -- if there's
// a better extension we could switch to that as an option
if (false && ZOTERO_CONFIG['DEBUG_TO_CONSOLE']){
try { try {
var logManager = var logManager =
Components.classes["@mozmonkey.com/debuglogger/manager;1"] Components.classes["@mozmonkey.com/debuglogger/manager;1"]

2
defaults/preferences/zotero.js
View File

@ -1,6 +1,8 @@
// These are DEFAULT prefs for the INSTALL. You will have to reinstall the extension to see differences! // These are DEFAULT prefs for the INSTALL. You will have to reinstall the extension to see differences!
// Display internal shortcut // Display internal shortcut
pref("extensions.zotero.debug.log",false);
pref("extensions.zotero.debug.level",5);
pref("extensions.zotero.automaticScraperUpdates",true); pref("extensions.zotero.automaticScraperUpdates",true);
pref("extensions.zotero.cacheTranslatorData",true); pref("extensions.zotero.cacheTranslatorData",true);
pref("extensions.zotero.zoteroPaneOnTop",false); pref("extensions.zotero.zoteroPaneOnTop",false);