Skip to content

S
srvpro
Commit b1600a10 authored by nanahira's avatar nanahira
Browse files
Options

better error catch

parent af9733ac
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 26 deletions
ygopro-server.coffee
View file @ b1600a10
...@@ -1074,20 +1074,24 @@ class Room ...@@ -1074,20 +1074,24 @@ class Room
else else
temp_list[result.name] = result.id temp_list[result.name] = result.id
return return
, () -> , (err) ->
official_database.each("select id,name from texts", (err, result) -> if err
if err log.warn("Error loaded pre-release database.", err)
log.warn("Error loading official database.", err) else
else if temp_list[result.name] and temp_list[result.name] != result.id official_database.each("select id,name from texts", (err, result) ->
official_code = result.id if err
pre_release_code = temp_list[result.name] log.warn("Error loading official database.", err)
list_official_to_pre[official_code] = pre_release_code else if temp_list[result.name] and temp_list[result.name] != result.id
list_pre_to_official[pre_release_code] = official_code official_code = result.id
return pre_release_code = temp_list[result.name]
#, () -> list_official_to_pre[official_code] = pre_release_code
# console.log("Load success.") list_pre_to_official[pre_release_code] = official_code
# return return
) , (err) ->
if err
log.warn("Error loaded official database.", err)
return
)
return return
) )
catch error catch error
......
ygopro-server.js
View file @ b1600a10
...@@ -1398,18 +1398,26 @@ ...@@ -1398,18 +1398,26 @@
} else { } else {
temp_list[result.name] = result.id; temp_list[result.name] = result.id;
} }
}, function() { }, function(err) {
official_database.each("select id,name from texts", function(err, result) { if (err) {
var official_code, pre_release_code; log.warn("Error loaded pre-release database.", err);
if (err) { } else {
log.warn("Error loading official database.", err); official_database.each("select id,name from texts", function(err, result) {
} else if (temp_list[result.name] && temp_list[result.name] !== result.id) { var official_code, pre_release_code;
official_code = result.id; if (err) {
pre_release_code = temp_list[result.name]; log.warn("Error loading official database.", err);
list_official_to_pre[official_code] = pre_release_code; } else if (temp_list[result.name] && temp_list[result.name] !== result.id) {
list_pre_to_official[pre_release_code] = official_code; official_code = result.id;
} pre_release_code = temp_list[result.name];
}); list_official_to_pre[official_code] = pre_release_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