Commit b1600a10 authored by nanahira's avatar nanahira

better error catch

parent af9733ac
...@@ -1074,7 +1074,10 @@ class Room ...@@ -1074,7 +1074,10 @@ class Room
else else
temp_list[result.name] = result.id temp_list[result.name] = result.id
return return
, () -> , (err) ->
if err
log.warn("Error loaded pre-release database.", err)
else
official_database.each("select id,name from texts", (err, result) -> official_database.each("select id,name from texts", (err, result) ->
if err if err
log.warn("Error loading official database.", err) log.warn("Error loading official database.", err)
...@@ -1084,9 +1087,10 @@ class Room ...@@ -1084,9 +1087,10 @@ class Room
list_official_to_pre[official_code] = pre_release_code list_official_to_pre[official_code] = pre_release_code
list_pre_to_official[pre_release_code] = official_code list_pre_to_official[pre_release_code] = official_code
return return
#, () -> , (err) ->
# console.log("Load success.") if err
# return log.warn("Error loaded official database.", err)
return
) )
return return
) )
......
...@@ -1398,7 +1398,10 @@ ...@@ -1398,7 +1398,10 @@
} else { } else {
temp_list[result.name] = result.id; temp_list[result.name] = result.id;
} }
}, function() { }, function(err) {
if (err) {
log.warn("Error loaded pre-release database.", err);
} else {
official_database.each("select id,name from texts", function(err, result) { official_database.each("select id,name from texts", function(err, result) {
var official_code, pre_release_code; var official_code, pre_release_code;
if (err) { if (err) {
...@@ -1409,7 +1412,12 @@ ...@@ -1409,7 +1412,12 @@
list_official_to_pre[official_code] = pre_release_code; list_official_to_pre[official_code] = pre_release_code;
list_pre_to_official[pre_release_code] = official_code; list_pre_to_official[pre_release_code] = official_code;
} }
}, function(err) {
if (err) {
log.warn("Error loaded official database.", err);
}
}); });
}
}); });
} catch (error1) { } catch (error1) {
error = error1; error = error1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment