The first version of CachedRequest.

1 files changed, 37 insertions, 3 deletions

diff --git a/lib/libbugzilla.js b/lib/libbugzilla.js
index 03ae6eb..d931a91 100644
--- a/lib/libbugzilla.js
+++ b/lib/libbugzilla.js
@@ -14,6 +14,7 @@ var urlMod = require("url");
 var xhrMod = require("xhr");
 var panelMod = require("panel");
 var myStorage = require("simple-storage");
+var CachedRequest = require("cached-request").CachedRequest;
 
 var JSONURLDefault = "https://fedorahosted.org/released"+
 "/bugzilla-triage-scripts/Config_data.json";
@@ -25,7 +26,7 @@ var copiedAttributes = [ "queryButton", "upstreamButton", "parseAbrtBacktraces",
 
 
 var config = exports.config = {};
-var debugOption = null;
+var debugOption = true;
 
 function Message(cmd, data) {
   debug("Message: cmd = " + cmd + ", data = " + data);
@@ -340,8 +341,15 @@ function loginToAllBugzillas(callback) {
             // Increment call counter
             loginCallsCounter++;
           });
+<<<<<<< HEAD
           if (loginCallsCounter == 0) {
             debug("No credentials!");
+=======
+          // loginCallsCounter is here approx. number of calls which
+          // were started; zero means we have no passwords at
+          // all, thus we have to run callback directly.
+          if (loginCallsCounter == 0) {
+>>>>>>> The first version of CachedRequest.
             callback(config);
           }
         },
@@ -382,6 +390,20 @@ var makeJSONRPCCall = exports.makeJSONRPCCall = function makeJSONRPCCall(url, me
   }).post();
 };
 
+<<<<<<< HEAD
+=======
+function processPageModeREs() {
+  var confD = config.configData;
+  if (confD.bugPageMatchStr) {
+    ['bugPageMatch', 'skipMatch'].forEach(function (key) {
+      confD[key] = confD[key+"Str"].map(function (REStr) {
+        return new RegExp(REStr);
+      });
+    });
+  }
+}
+
+>>>>>>> The first version of CachedRequest.
 /**
  * Preprocess JSON into config data structure.
  *
@@ -514,8 +536,20 @@ exports.initialize = function initialize(callback) {
   var urlStr = preferences.get(prefJSONURLName, JSONURLDefault);
   preferences.set(prefJSONURLName, urlStr);
 
-  debug("Starting initialize!");
-  fetchConfigurationJSON(urlStr, callback);
+  CachedRequest({
+    url: urlStr,
+    getExpiredAnyway: true,
+    onComplete: function (response) {
+      if (response.status == 200) {
+        processConfigJSON(response.json);
+        if (("submitsLogging" in config.gJSONData.configData) &&
+            config.gJSONData.configData.submitsLogging) {
+          logger.initialize();
+        }
+        loginToAllBugzillas(callback);
+      }
+    }
+  });
 }
 
 //vim: set ts=2 et sw=2 textwidth=80: