Added Unirest Timeouts

* For API and API-Legacy * Updated Status messages * Version 0.13.19
aneesh-neelam · Feb 13, 2015 · 9cd7270 · 9cd7270
1 parent 079a247
commit 9cd7270
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 5 deletions.
diff --git a/api-legacy/login/get.js b/api-legacy/login/get.js
@@ -71,5 +71,6 @@ exports.get = function (app, data, callback) {
     };
     unirest.get(captchaUri)
         .encoding(null)
+        .timeout(29000)
         .end(onRequest);
 };
diff --git a/api-legacy/login/submit.js b/api-legacy/login/submit.js
@@ -118,6 +118,7 @@ exports.get = function (app, data, callback) {
                 'wdpswd': data.dob,
                 'vrfcd': data.captcha
             })
+            .timeout(29000)
             .end(onPost);
     }
     else {

diff --git a/api-legacy/scraper/attendance.js b/api-legacy/scraper/attendance.js
@@ -114,6 +114,7 @@ exports.scrapeAttendance = function (app, data, callback) {
                     unirest.post(attendanceDetailsUri)
                         .jar(CookieJar)
                         .form(doc.form)
+                        .timeout(28500)
                         .end(onPost);
                 };
                 async.map(attendance, doDetails, callback);
@@ -129,5 +130,6 @@ exports.scrapeAttendance = function (app, data, callback) {
     CookieJar.add(unirest.cookie(cookieSerial), attendanceDetailsUri);
     unirest.post(attendanceUri)
         .jar(CookieJar)
+        .timeout(29000)
         .end(onRequest);
 };
diff --git a/api-legacy/scraper/marks.js b/api-legacy/scraper/marks.js
@@ -191,5 +191,6 @@ exports.scrapeMarks = function (app, data, callback) {
     CookieJar.add(unirest.cookie(cookieSerial), marksUri);
     unirest.post(marksUri)
         .jar(CookieJar)
+        .timeout(29000)
         .end(onRequest);
 };
diff --git a/api-legacy/scraper/timetable.js b/api-legacy/scraper/timetable.js
@@ -183,5 +183,6 @@ exports.scrapeTimetable = function (app, data, callback) {
     CookieJar.add(unirest.cookie(cookieSerial), timetableUri);
     unirest.post(timetableUri)
         .jar(CookieJar)
+        .timeout(29000)
         .end(onRequest);
 };
diff --git a/api-legacy/status.js b/api-legacy/status.js
@@ -25,7 +25,7 @@ var error = {
     tokenExpired: {message: 'Token expired', code: 14},
     noData: {message: 'Requested data is not available', code: 15},
     toDo: {message: 'This feature is incomplete', code: 50},
-    vitDown: {message: 'VIT\'s servers may be down or we may be facing a connectivity issue', code: 89},
+    vitDown: {message: 'VIT\'s servers may be slowed down or we may be facing a connectivity issue', code: 89},
     mongoDown: {message: 'Our MongoDB instance may be down or we may be facing a connectivity issue', code: 97},
     outage: {message: 'Our backend servers may be down or you may be facing a connectivity issue', code: 98},
     other: {message: 'An unforeseen error has occurred', code: 99}

diff --git a/api/login/get.js b/api/login/get.js
@@ -71,5 +71,6 @@ exports.get = function (app, data, callback) {
     };
     unirest.get(captchaUri)
         .encoding(null)
+        .timeout(29000)
         .end(onRequest);
 };
diff --git a/api/login/submit.js b/api/login/submit.js
@@ -118,6 +118,7 @@ exports.get = function (app, data, callback) {
                 'wdpswd': data.dob,
                 'vrfcd': data.captcha
             })
+            .timeout(29000)
             .end(onPost);
     }
     else {

diff --git a/api/scraper/attendance.js b/api/scraper/attendance.js
@@ -124,6 +124,7 @@ exports.scrapeAttendance = function (app, data, callback) {
                     unirest.post(attendanceDetailsUri)
                         .jar(CookieJar)
                         .form(doc.form)
+                        .timeout(28500)
                         .end(onPost);
                 };
                 async.map(attendance, doDetails, callback);
@@ -139,5 +140,6 @@ exports.scrapeAttendance = function (app, data, callback) {
     CookieJar.add(unirest.cookie(cookieSerial), attendanceDetailsUri);
     unirest.post(attendanceUri)
         .jar(CookieJar)
+        .timeout(29000)
         .end(onRequest);
 };
diff --git a/api/scraper/marks.js b/api/scraper/marks.js
@@ -195,5 +195,6 @@ exports.scrapeMarks = function (app, data, callback) {
     CookieJar.add(unirest.cookie(cookieSerial), marksUri);
     unirest.post(marksUri)
         .jar(CookieJar)
+        .timeout(29000)
         .end(onRequest);
 };
diff --git a/api/scraper/timetable.js b/api/scraper/timetable.js
@@ -183,5 +183,6 @@ exports.scrapeTimetable = function (app, data, callback) {
     CookieJar.add(unirest.cookie(cookieSerial), timetableUri);
     unirest.post(timetableUri)
         .jar(CookieJar)
+        .timeout(29000)
         .end(onRequest);
 };
diff --git a/api/status.js b/api/status.js
@@ -25,7 +25,7 @@ var error = {
     tokenExpired: {message: 'Token expired', code: 14},
     noData: {message: 'Requested data is not available', code: 15},
     toDo: {message: 'This feature is incomplete', code: 50},
-    vitDown: {message: 'VIT\'s servers may be down or we may be facing a connectivity issue', code: 89},
+    vitDown: {message: 'VIT\'s servers may be slowed down or we may be facing a connectivity issue', code: 89},
     mongoDown: {message: 'Our MongoDB instance may be down or we may be facing a connectivity issue', code: 97},
     maintenance: {message: 'Our backend servers are down for maintenance', code: 98},
     other: {message: 'An unforeseen error has occurred', code: 99}

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "VITacademics",
-  "version": "0.13.18",
+  "version": "0.13.19",
   "description": "VITacademics Backend and Web App",
   "bugs": {
     "url": "https://github.com/aneesh-neelam/VITacademics/issues",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "VITacademics",
-  "version": "0.13.18",
+  "version": "0.13.19",
   "description": "VITacademics Backend and Web App",
   "homepage": "http://vitacademics-dev.herokuapp.com/",
   "bugs": {

diff --git a/routes/web.js b/routes/web.js
@@ -35,7 +35,7 @@ router.get('/status', function (req, res) {
         platform: process.platform,
         arch: process.arch,
         serverStatus: 'OK',
-        lastUpdated: '12th February 2015',
+        lastUpdated: '13th February 2015',
         googleAnalyticsToken: googleAnalyticsToken
     };
     res.render('status', status);