Просмотр исходного кода

catch err in importDataFromQiita and importDataFromEsa, removed try catch from testConnectionToEsa and testConnectionToQiita

mizozobu 7 лет назад
Родитель
Сommit
536e8d552a
2 измененных файлов с 18 добавлено и 14 удалено
  1. 16 2
      lib/routes/admin.js
  2. 2 12
      lib/util/importer.js

+ 16 - 2
lib/routes/admin.js

@@ -1250,7 +1250,14 @@ module.exports = function(crowi, app) {
    */
   actions.api.importDataFromEsa = async(req, res) => {
     const user = req.user;
-    const errors = await importer.importDataFromEsa(user);
+    let errors;
+
+    try {
+      errors = await importer.importDataFromEsa(user);
+    }
+    catch (err) {
+      errors = [err];
+    }
 
     if (errors.length > 0) {
       return res.json({ status: false, message: `<br> - ${errors.join('<br> - ')}` });
@@ -1266,7 +1273,14 @@ module.exports = function(crowi, app) {
    */
   actions.api.importDataFromQiita = async(req, res) => {
     const user = req.user;
-    const errors = await importer.importDataFromQiita(user);
+    let errors;
+
+    try {
+      errors = await importer.importDataFromQiita(user);
+    }
+    catch (err) {
+      errors = [err];
+    }
 
     if (errors.length > 0) {
       return res.json({ status: false, message: `<br> - ${errors.join('<br> - ')}` });

+ 2 - 12
lib/util/importer.js

@@ -147,24 +147,14 @@ module.exports = crowi => {
    * Import page data from esa to GROWI
    */
   importer.testConnectionToEsa = async() => {
-    try {
-      await getTeamNameFromEsa();
-    }
-    catch (err) {
-      throw err;
-    }
+    await getTeamNameFromEsa();
   };
 
   /**
    * Import page data from qiita to GROWI
    */
   importer.testConnectionToQiita = async() => {
-    try {
-      await restQiitaAPIService.getQiitaUser();
-    }
-    catch (err) {
-      throw err;
-    }
+    await restQiitaAPIService.getQiitaUser();
   };
 
   /**