Merge branch 'master' into normal-server

RPing · Oct 21, 2017 · acba741 · acba741
2 parents 3f496a5 + 5bb26e1
commit acba741
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/bot.js b/bot.js
@@ -43,18 +43,17 @@ function notify(projectPlatform, projectName, releasePage, results, cb) {
 
 function checkAndNotify(results, projectInfo, projectName, projectPlatform, cb) {
     if (needToNotify(results)) {
-        async.waterfall([
+        async.series([
             function (inner_cb) {
                 const releasePage = site.siteUtil(projectPlatform).getReleasesPage(projectInfo)
                 notify(projectPlatform, projectName, releasePage, results, inner_cb)
             }
-        ], function waterfallCallback(hasSomeError) {
-            if (hasSomeError)
-                return cb(new Error(`failed: ${projectName}`))
+        ], function seriesCallback(err) {
+            if (err)
+                cb(new Error(`failed: ${projectName}`))
         })
-    }
-
-    cb(null, `success: ${projectName}`)
+    } else
+        cb(null, `success: ${projectName}`)
 }
 
 /*

diff --git a/lib/sites/project/github.js b/lib/sites/project/github.js
@@ -22,7 +22,8 @@ class Github {
     }
 
     getNewVersionInfo(check_date, project, cb) {
-        const req = request(`https://github.com/${project.project_author}/${project.project_name}/releases.atom`)
+        const url = `https://github.com/${project.project_author}/${project.project_name}/releases.atom`
+        const req = request(url, { timeout: 1500 })
         const feedparser = new FeedParser({ addmeta: false })
 
         const info = []

diff --git a/lib/sites/project/pypi.js b/lib/sites/project/pypi.js
@@ -22,8 +22,9 @@ class Pypi {
 
     getNewVersionInfo(check_date, project, cb) {
         const info = []
+        const url = `https://pypi.python.org/pypi/${project.project_name}/json`
 
-        request(`https://pypi.python.org/pypi/${project.project_name}/json`, (error, response, body) => {
+        request(url, { timeout: 3000 }, (error, response, body) => {
             if (error)
                 return cb(error)