From b650ab31b6ffec0eca4f1378219b364960f5233e Mon Sep 17 00:00:00 2001 From: FelisCatus Date: Sat, 28 Feb 2015 00:57:41 +0800 Subject: [PATCH] Don't count timeoutAbort in obsolete main_frame as errors. --- omega-target-chromium-extension/src/web_request_monitor.coffee | 2 ++ omega-target/src/options.coffee | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/omega-target-chromium-extension/src/web_request_monitor.coffee b/omega-target-chromium-extension/src/web_request_monitor.coffee index a181083..25f19c3 100644 --- a/omega-target-chromium-extension/src/web_request_monitor.coffee +++ b/omega-target-chromium-extension/src/web_request_monitor.coffee @@ -149,6 +149,7 @@ module.exports = class WebRequestMonitor } setTabRequestInfo: (status, req) -> + console.log(req.tabId, status, req.type, req.url) info = @tabInfo[req.tabId] if info if status == 'start' and req.type == 'main_frame' @@ -159,6 +160,7 @@ module.exports = class WebRequestMonitor if (oldStatus = info.requestStatus[req.requestId]) info[@eventCategory[oldStatus] + 'Count']-- else + return if status == 'timeoutAbort' info.requestCount++ info.requestStatus[req.requestId] = status info[@eventCategory[status] + 'Count']++ diff --git a/omega-target/src/options.coffee b/omega-target/src/options.coffee index e120837..93f753f 100644 --- a/omega-target/src/options.coffee +++ b/omega-target/src/options.coffee @@ -816,7 +816,7 @@ class Options profile = OmegaPac.Profiles.byName(@_currentProfileName, @_options) if not profile?.rules? return Promise.reject new Error( - "Cannot add condition to Profile #{@profile.name} (@{profile.type})") + "Cannot add condition to Profile #{@profile.name} (#{profile.type})") target = OmegaPac.Profiles.byName(profileName, @_options) if not target? return Promise.reject new ProfileNotExistError(profileName)