Skip to content
Snippets Groups Projects
Commit 0148084b authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Log errors when msgbase open failures occur.

This should help to root-cause any future msgbase open failures like those
that I suspect were a result of Issue #4.
parent b2be9f52
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #593 passed
...@@ -106,7 +106,10 @@ function getReferenceTo(hdr) { ...@@ -106,7 +106,10 @@ function getReferenceTo(hdr) {
for(s in msg_area.grp_list[g].sub_list) for(s in msg_area.grp_list[g].sub_list)
if (msg_area.grp_list[g].sub_list[s].newsgroup.toLowerCase() == newsgroups[n].toLowerCase()) { if (msg_area.grp_list[g].sub_list[s].newsgroup.toLowerCase() == newsgroups[n].toLowerCase()) {
var mb=new MsgBase(msg_area.grp_list[g].sub_list[s].code); var mb=new MsgBase(msg_area.grp_list[g].sub_list[s].code);
if (mb.open() != true) continue; if (!mb.open() ) {
log(LOG_ERR, "Error " + mb.error + " opening " + mb.file);
continue;
}
var hdr2 = mb.get_msg_header(hdr.reply_id); var hdr2 = mb.get_msg_header(hdr.reply_id);
if (hdr2 != null) to = hdr2.from; if (hdr2 != null) to = hdr2.from;
mb.close(); mb.close();
...@@ -323,7 +326,8 @@ while(client.socket.is_connected && !quit) { ...@@ -323,7 +326,8 @@ while(client.socket.is_connected && !quit) {
if(msgbase.open()==true) { if(msgbase.open()==true) {
writeln(format("mail %u %u n", msgbase.last_msg, msgbase.first_msg)); writeln(format("mail %u %u n", msgbase.last_msg, msgbase.first_msg));
msgbase.close(); msgbase.close();
} } else
log(LOG_ERR, "Error " + msgbase.error + " opening " + msgbase.file);
} }
for(g in msg_area.grp_list) for(g in msg_area.grp_list)
for(s in msg_area.grp_list[g].sub_list) { for(s in msg_area.grp_list[g].sub_list) {
...@@ -332,8 +336,10 @@ while(client.socket.is_connected && !quit) { ...@@ -332,8 +336,10 @@ while(client.socket.is_connected && !quit) {
if(msgbase && msgbase.is_open) if(msgbase && msgbase.is_open)
msgbase.close(); msgbase.close();
msgbase=new MsgBase(msg_area.grp_list[g].sub_list[s].code); msgbase=new MsgBase(msg_area.grp_list[g].sub_list[s].code);
if(msgbase.open!=undefined && msgbase.open()==false) if(!msgbase.open()) {
log(LOG_ERR, "Error " + msgbase.error + " opening " + msgbase.file);
continue; continue;
}
var count = count_msgs(msgbase); var count = count_msgs(msgbase);
writeln(format("%s %u %u %s" writeln(format("%s %u %u %s"
,msg_area.grp_list[g].sub_list[s].newsgroup ,msg_area.grp_list[g].sub_list[s].newsgroup
...@@ -454,8 +460,8 @@ while(client.socket.is_connected && !quit) { ...@@ -454,8 +460,8 @@ while(client.socket.is_connected && !quit) {
if(ini_file.open("r")) { if(ini_file.open("r")) {
var created = ini_file.iniGetValue(null, "Created", 0); var created = ini_file.iniGetValue(null, "Created", 0);
ini_file.close(); ini_file.close();
if(created >= compare.getTime() / 1000 if(created >= compare.getTime() / 1000) {
&& msgbase.open()) { if(msgbase.open()) {
var count = count_msgs(msgbase); var count = count_msgs(msgbase);
writeln(format("%s %u %u %s" writeln(format("%s %u %u %s"
,msg_area.grp_list[g].sub_list[s].newsgroup ,msg_area.grp_list[g].sub_list[s].newsgroup
...@@ -464,6 +470,9 @@ while(client.socket.is_connected && !quit) { ...@@ -464,6 +470,9 @@ while(client.socket.is_connected && !quit) {
,msg_area.grp_list[g].sub_list[s].is_moderated ? "m" : (msg_area.grp_list[g].sub_list[s].can_post ? "y" : "n") ,msg_area.grp_list[g].sub_list[s].is_moderated ? "m" : (msg_area.grp_list[g].sub_list[s].can_post ? "y" : "n")
)); ));
msgbase.close(); msgbase.close();
} else {
log(LOG_ERR, "Error " + msgbase.error + " opening " + msgbase.file);
}
} }
} }
} }
...@@ -493,6 +502,8 @@ while(client.socket.is_connected && !quit) { ...@@ -493,6 +502,8 @@ while(client.socket.is_connected && !quit) {
if(msgbase.open()==true) { if(msgbase.open()==true) {
selected = { newsgroup: "mail" }; selected = { newsgroup: "mail" };
found=true; found=true;
} else {
log(LOG_ERR, "Error " + msgbase.error + " opening " + msgbase.file);
} }
} }
if(!found) { if(!found) {
...@@ -502,8 +513,10 @@ while(client.socket.is_connected && !quit) { ...@@ -502,8 +513,10 @@ while(client.socket.is_connected && !quit) {
for(s in msg_area.grp_list[g].sub_list) for(s in msg_area.grp_list[g].sub_list)
if(msg_area.grp_list[g].sub_list[s].newsgroup.toLowerCase()==cmd[1].toLowerCase()) { if(msg_area.grp_list[g].sub_list[s].newsgroup.toLowerCase()==cmd[1].toLowerCase()) {
msgbase=new MsgBase(msg_area.grp_list[g].sub_list[s].code); msgbase=new MsgBase(msg_area.grp_list[g].sub_list[s].code);
if(msgbase.open!=undefined && msgbase.open()==false) if(!msgbase.open()) {
log(LOG_ERR, "Error " + msgbase.error + " opening " + msgbase.file);
continue; continue;
}
found=true; found=true;
selected=msg_area.grp_list[g].sub_list[s]; selected=msg_area.grp_list[g].sub_list[s];
break; break;
...@@ -951,8 +964,10 @@ while(client.socket.is_connected && !quit) { ...@@ -951,8 +964,10 @@ while(client.socket.is_connected && !quit) {
} }
msgbase=new MsgBase(msg_area.grp_list[g].sub_list[s].code); msgbase=new MsgBase(msg_area.grp_list[g].sub_list[s].code);
if(msgbase.open!=undefined && msgbase.open()==false) if(!msgbase.open()) {
log(LOG_ERR, "Error " + msgbase.error + " opening " + msgbase.file);
continue; continue;
}
/* NNTP Control Message? */ /* NNTP Control Message? */
if(hdr.control!=undefined) { if(hdr.control!=undefined) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment