[Pkg-mozext-commits] [requestpolicy] 209/257: [ref] logging: reduce number of messages
David Prévot
taffit at moszumanska.debian.org
Thu Jan 28 03:20:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit 732ba862728ac392ea79028d71e67fe5ca3173fb
Author: Martin Kimmerle <dev at 256k.de>
Date: Sun Dec 13 15:25:03 2015 +0100
[ref] logging: reduce number of messages
---
src/content/lib/manager-for-event-listeners.jsm | 8 ++++++++
src/content/lib/manager-for-message-listeners.jsm | 8 ++++++++
src/content/lib/request-processor.jsm | 20 ++++++++++++++++++++
src/content/ui/overlay.js | 4 ++++
4 files changed, 40 insertions(+)
diff --git a/src/content/lib/manager-for-event-listeners.jsm b/src/content/lib/manager-for-event-listeners.jsm
index ae2a0d1..fd83454 100644
--- a/src/content/lib/manager-for-event-listeners.jsm
+++ b/src/content/lib/manager-for-event-listeners.jsm
@@ -64,9 +64,11 @@ function ManagerForEventListeners(aEnv) {
self.environment.addStartupFunction(
Environment.LEVELS.INTERFACE,
function() {
+ // #ifdef LOG_EVENT_LISTENERS
Logger.dump("From now on new event listeners will be " +
"added immediately. Environment: \"" +
self.environment.name + "\"");
+ // #endif
self.addNewListenersImmediately = true;
self.addAllListeners();
});
@@ -110,9 +112,11 @@ ManagerForEventListeners.prototype.addListener = function(aEventTarget,
listening: false
};
if (self.addNewListenersImmediately) {
+ // #ifdef LOG_EVENT_LISTENERS
Logger.dump("Immediately adding event listener for \"" +
listener.eventType + "\". Environment: \"" +
self.environment.name + "\"");
+ // #endif
addEvLis(listener);
}
self.listeners.push(listener);
@@ -125,9 +129,11 @@ ManagerForEventListeners.prototype.addAllListeners = function() {
let self = this;
for (let listener of self.listeners) {
if (listener.listening === false) {
+ // #ifdef LOG_EVENT_LISTENERS
Logger.dump("Lazily adding event listener for \"" +
listener.eventType + "\". Environment: \"" +
self.environment.name + "\"");
+ // #endif
addEvLis(listener);
}
}
@@ -140,8 +146,10 @@ ManagerForEventListeners.prototype.removeAllListeners = function() {
let self = this;
while (self.listeners.length > 0) {
let listener = self.listeners.pop();
+ // #ifdef LOG_EVENT_LISTENERS
Logger.dump("Removing event listener for \"" + listener.eventType +
"\". Environment: \"" + self.environment.name + "\"");
+ // #endif
listener.target.removeEventListener(listener.eventType, listener.callback,
listener.useCapture);
}
diff --git a/src/content/lib/manager-for-message-listeners.jsm b/src/content/lib/manager-for-message-listeners.jsm
index 2e54b48..7b15e3d 100644
--- a/src/content/lib/manager-for-message-listeners.jsm
+++ b/src/content/lib/manager-for-message-listeners.jsm
@@ -65,9 +65,11 @@ function ManagerForMessageListeners(aEnv, aMM) {
self.environment.addStartupFunction(
Environment.LEVELS.INTERFACE,
function() {
+ // #ifdef LOG_MESSAGE_LISTENERS
Logger.dump("From now on new message listeners will be " +
"added immediately. Environment: \"" +
self.environment.name + "\"");
+ // #endif
self.addNewListenersImmediately = true;
self.addAllListeners();
});
@@ -130,9 +132,11 @@ ManagerForMessageListeners.prototype.addListener = function(aMessageName,
listening: false
};
if (aAddImmediately === true || self.addNewListenersImmediately) {
+ // #ifdef LOG_MESSAGE_LISTENERS
Logger.dump("Immediately adding message listener for \"" +
listener.messageName + "\". Environment: \"" +
self.environment.name + "\"");
+ // #endif
self.mm.addMessageListener(listener.messageID, listener.callback);
listener.listening = true;
}
@@ -146,9 +150,11 @@ ManagerForMessageListeners.prototype.addAllListeners = function() {
let self = this;
for (let listener of self.listeners) {
if (listener.listening === false) {
+ // #ifdef LOG_MESSAGE_LISTENERS
Logger.dump("Lazily adding message listener for \"" +
listener.messageName + "\". Environment: \"" +
self.environment.name + "\"");
+ // #endif
self.mm.addMessageListener(listener.messageID, listener.callback);
listener.listening = true;
}
@@ -168,8 +174,10 @@ ManagerForMessageListeners.prototype.removeAllListeners = function() {
// 'is undefined!');
// continue;
//}
+ // #ifdef LOG_MESSAGE_LISTENERS
Logger.dump("Removing message listener for \"" + listener.messageName +
"\".");
+ // #endif
//try {
self.mm.removeMessageListener(listener.messageID, listener.callback);
//} catch (e) {
diff --git a/src/content/lib/request-processor.jsm b/src/content/lib/request-processor.jsm
index 45590ef..0f6aa29 100644
--- a/src/content/lib/request-processor.jsm
+++ b/src/content/lib/request-processor.jsm
@@ -310,16 +310,24 @@ var RequestProcessor = (function() {
// only return requests from the given base domain
continue;
}
+ // #ifdef LOG_GETTING_SAVED_REQUESTS
Logger.dump("test originUri: " + originUri);
+ // #endif
let originUriRequests = requests[originUri];
for (let destBase in originUriRequests) {
+ // #ifdef LOG_GETTING_SAVED_REQUESTS
Logger.dump("test destBase: " + destBase);
+ // #endif
let destBaseRequests = originUriRequests[destBase];
for (let destIdent in destBaseRequests) {
+ // #ifdef LOG_GETTING_SAVED_REQUESTS
Logger.dump("test destIdent: " + destIdent);
+ // #endif
let destIdentRequests = destBaseRequests[destIdent];
for (let destUri in destIdentRequests) {
+ // #ifdef LOG_GETTING_SAVED_REQUESTS
Logger.dump("test destUri: " + destUri);
+ // #endif
let dest = destIdentRequests[destUri];
for (let i in dest) {
// TODO: This variable could have been created easily already in
@@ -385,8 +393,10 @@ var RequestProcessor = (function() {
function _addRecursivelyAllRequestsFromURI(originURI, reqSet,
checkedOrigins) {
+ // #ifdef LOG_GETTING_SAVED_REQUESTS
Logger.dump("Looking for other origins within allowed requests from " +
originURI);
+ // #endif
if (!checkedOrigins[originURI]) {
// this "if" is needed for the first call of this function.
checkedOrigins[originURI] = true;
@@ -398,8 +408,10 @@ var RequestProcessor = (function() {
for (var destBase in allowedRequests) {
for (var destIdent in allowedRequests[destBase]) {
for (var destURI in allowedRequests[destBase][destIdent]) {
+ // #ifdef LOG_GETTING_SAVED_REQUESTS
Logger.dump("Found allowed request to <" + destURI + "> " +
"from <" + originURI + ">");
+ // #endif
reqSet.addRequest(originURI, destURI,
allowedRequests[destBase][destIdent][destURI]);
@@ -417,15 +429,19 @@ var RequestProcessor = (function() {
}
function _addAllDeniedRequestsFromURI(originURI, reqSet) {
+ // #ifdef LOG_GETTING_SAVED_REQUESTS
Logger.dump("Looking for other origins within denied requests from " +
originURI);
+ // #endif
var requests = RequestProcessor._rejectedRequests.getOriginUri(originURI);
if (requests) {
for (var destBase in requests) {
for (var destIdent in requests[destBase]) {
for (var destUri in requests[destBase][destIdent]) {
+ // #ifdef LOG_GETTING_SAVED_REQUESTS
Logger.dump("Found denied request to <" + destUri + "> from <" +
originURI + ">");
+ // #endif
reqSet.addRequest(originURI, destUri,
requests[destBase][destIdent][destUri]);
}
@@ -1025,14 +1041,18 @@ var RequestProcessor = (function() {
self.getDeniedRequests = function(currentlySelectedOrigin,
allRequestsOnDocument) {
+ // #ifdef LOG_GETTING_SAVED_REQUESTS
Logger.dump("## getDeniedRequests");
+ // #endif
return _getRequestsHelper(currentlySelectedOrigin, allRequestsOnDocument,
false);
};
self.getAllowedRequests = function(currentlySelectedOrigin,
allRequestsOnDocument) {
+ // #ifdef LOG_GETTING_SAVED_REQUESTS
Logger.dump("## getAllowedRequests");
+ // #endif
return _getRequestsHelper(currentlySelectedOrigin, allRequestsOnDocument,
true);
};
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index 9f5645f..2db7286 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -589,8 +589,10 @@ window.rpcontinued.overlay = (function() {
try {
let browser = gBrowser.selectedBrowser;
let uri = DomainUtil.stripFragment(browser.currentURI.spec);
+ // #ifdef LOG_FLAG_STATE
Logger.debug(Logger.TYPE_INTERNAL,
"Checking for blocked requests from page <" + uri + ">");
+ // #endif
// TODO: this needs to be rewritten. checking if there is blocked
// content could be done much more efficiently.
@@ -598,10 +600,12 @@ window.rpcontinued.overlay = (function() {
.getAllRequestsInBrowser(browser).containsBlockedRequests();
self._setContentBlockedState(documentContainsBlockedContent);
+ // #ifdef LOG_FLAG_STATE
let logText = documentContainsBlockedContent ?
"Requests have been blocked." :
"No requests have been blocked.";
Logger.debug(Logger.TYPE_INTERNAL, logText);
+ // #endif
} catch (e) {
Logger.severeError(
"Unable to complete _updateBlockedContentState actions: " + e, e);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git
More information about the Pkg-mozext-commits
mailing list