From 2198aff596ad3d737a57d682568d532b784a3b7b Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Wed, 28 Sep 2005 07:53:31 +0000
Subject: [PATCH] Use appropriate log level parameter in calls to log()
function - allows filtering by log level by sysop configuration.
---
exec/bulkmail.js | 6 +++---
exec/fingerservice.js | 4 ++--
exec/gopherservice.js | 8 ++++----
exec/ircd.js | 20 ++++++++++----------
exec/ircmsg.js | 6 +++---
exec/load/ircd_server.js | 2 +-
exec/load/ircd_unreg.js | 2 +-
exec/load/ircd_user.js | 2 +-
exec/menu.js | 4 ++--
exec/newuser.js | 8 ++++----
exec/nntpservice.js | 28 ++++++++++++++--------------
exec/purgefiles.js | 2 +-
exec/testbuild.js | 2 +-
13 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/exec/bulkmail.js b/exec/bulkmail.js
index 807c30c414..3fd9ff028b 100644
--- a/exec/bulkmail.js
+++ b/exec/bulkmail.js
@@ -32,7 +32,7 @@ if(!file_exists(fname)) // Edit aborted
file = new File(fname);
if(!file.open("rt")) {
- log("!ERROR " + errno_str + " opening " + fname);
+ log(LOG_ERR,"!ERROR " + errno_str + " opening " + fname);
exit();
}
msgtxt = lfexpand(file.read(file_size(fname)));
@@ -44,7 +44,7 @@ if(msgtxt == "")
msgbase = new MsgBase("mail");
if(msgbase.open()==false) {
- log("!ERROR " + msgbase.last_error);
+ log(LOG_ERR,"!ERROR " + msgbase.last_error);
exit();
}
@@ -85,7 +85,7 @@ for(i=1; i<=lastuser; i++)
hdr = { from: system.operator, from_ext: "1", subject: subj };
if(!msgbase.save_msg(hdr, msgtxt, rcpt_list))
- log("!ERROR " + msgbase.last_error + "saving bulkmail message");
+ log(LOG_ERR,"!ERROR " + msgbase.last_error + "saving bulkmail message");
msgbase.close();
diff --git a/exec/fingerservice.js b/exec/fingerservice.js
index 53ae0d64f2..4e00d46b1a 100644
--- a/exec/fingerservice.js
+++ b/exec/fingerservice.js
@@ -121,13 +121,13 @@ else // UDP
request = datagram;
if(request==null) {
- log("!TIMEOUT waiting for request");
+ log(LOG_WARNING,"!TIMEOUT waiting for request");
exit();
}
request = truncsp(request);
-log("client request: " + request);
+log(LOG_DEBUG,"client request: " + request);
if(request.substr(0,2).toUpperCase()=="/W") // "higher level of verbosity"
request=request.slice(2); // ignored...
diff --git a/exec/gopherservice.js b/exec/gopherservice.js
index bd5470369f..4d7a96ea2b 100644
--- a/exec/gopherservice.js
+++ b/exec/gopherservice.js
@@ -24,7 +24,7 @@ for(i=0;i<argc;i++)
function write(str)
{
if(debug)
- log("rsp: " + str);
+ log(LOG_DEBUG,"rsp: " + str);
client.socket.send(str);
}
@@ -48,17 +48,17 @@ function send_file(fname)
var msgbase=null;
if(!login("guest"))
- log("!WARNING: NO GUEST ACCOUNT CONFIGURED");
+ log(LOG_WARNING,"!WARNING: NO GUEST ACCOUNT CONFIGURED");
// Get Request
request = client.socket.recvline(512 /*maxlen*/, 10 /*timeout*/);
if(request==null) {
- log("!TIMEOUT waiting for request");
+ log(LOG_WARNING,"!TIMEOUT waiting for request");
exit();
}
-log("client request: '" + request + "'");
+log(LOG_DEBUG,"client request: '" + request + "'");
var prefix="";
var gopher_plus=false;
diff --git a/exec/ircd.js b/exec/ircd.js
index 44e238bc6d..eb30e4436c 100644
--- a/exec/ircd.js
+++ b/exec/ircd.js
@@ -182,7 +182,7 @@ function parse_nline_flags(flags) {
nline_flags |= NLINE_IS_DREAMHAVEN;
break;
default:
- log("!WARNING Unknown N:Line flag '" + flags[thisflag] + "' in config.");
+ log(LOG_WARNING,"!WARNING Unknown N:Line flag '" + flags[thisflag] + "' in config.");
break;
}
}
@@ -271,7 +271,7 @@ function parse_oline_flags(flags) {
oline_flags |= OLINE_CAN_UMODEC;
break;
default:
- log("!WARNING Unknown O:Line flag '" + flags[thisflag] + "' in config.");
+ log(LOG_WARNING,"!WARNING Unknown O:Line flag '" + flags[thisflag] + "' in config.");
break;
}
}
@@ -468,7 +468,7 @@ function read_config_file() {
if(!file_exists(fname))
fname=system.ctrl_dir + "ircd.conf";
}
- log("Reading Config: " + fname);
+ log(LOG_INFO,"Reading Config: " + fname);
var conf = new File(fname);
if (conf.open("r")) {
while (!conf.eof) {
@@ -513,7 +513,7 @@ function read_config_file() {
break;
var kline_mask = create_ban_mask(arg[1],true);
if (!kline_mask) {
- log("!WARNING Invalid K:Line (" + arg[1] + ")");
+ log(LOG_WARNING,"!WARNING Invalid K:Line (" + arg[1] + ")");
break;
}
KLines.push(new KLine(kline_mask,arg[2],"K"));
@@ -578,16 +578,16 @@ function read_config_file() {
}
function create_new_socket(port) {
- log("Creating new socket object on port " + port);
+ log(LOG_DEBUG,"Creating new socket object on port " + port);
var newsock = new Socket();
if(!newsock.bind(port,server.interface_ip_address)) {
- log("!Error " + newsock.error + " binding socket to TCP port " + port);
+ log(LOG_ERR,"!Error " + newsock.error + " binding socket to TCP port " + port);
return 0;
}
log(format("%04u ",newsock.descriptor)
+ "IRC server socket bound to TCP port " + port);
if(!newsock.listen(5 /* backlog */)) {
- log("!Error " + newsock.error + " setting up socket for listening");
+ log(LOG_ERR,"!Error " + newsock.error + " setting up socket for listening");
return 0;
}
return newsock;
@@ -867,7 +867,7 @@ function rawout(str) {
}
sendsock = Servers[this.parent.toLowerCase()].socket;
} else {
- log("!ERROR: No socket to send to?");
+ log(LOG_ERR,"!ERROR: No socket to send to?");
return 0;
}
@@ -894,7 +894,7 @@ function originatorout(str,origin) {
sendsock = Servers[this.parent.toLowerCase()].socket;
send_data = ":" + origin.nick + " " + str;
} else {
- log("!ERROR: No socket to send to?");
+ log(LOG_ERR,"!ERROR: No socket to send to?");
return 0;
}
@@ -914,7 +914,7 @@ function ircout(str) {
} else if (this.parent) {
sendsock = Servers[this.parent.toLowerCase()].socket;
} else {
- log("!ERROR: No socket to send to?");
+ log(LOG_ERR,"!ERROR: No socket to send to?");
return 0;
}
diff --git a/exec/ircmsg.js b/exec/ircmsg.js
index a0cec851df..a7f5e20e16 100644
--- a/exec/ircmsg.js
+++ b/exec/ircmsg.js
@@ -46,8 +46,8 @@ for(i=0;i<argc;i++) {
}
}
-log("Using nick: " + nick);
-log("Connecting to: " +server+ " port " + port);
+log(LOG_INFO,"Using nick: " + nick);
+log(LOG_INFO,"Connecting to: " +server+ " port " + port);
my_server = IRC_client_connect(server,nick,undefined,undefined,port);
if(!my_server) {
alert("!Couldn't connect to " + server);
@@ -62,7 +62,7 @@ while(!done) {
log(response);
/* Nick in use... */
nick+='_';
- log("Using nick: " + nick);
+ log(LOG_INFO,"Using nick: " + nick);
my_server.send("NICK " + nick + "\r\n");
}
if(resp[1]=='422' || resp[1]=='376')
diff --git a/exec/load/ircd_server.js b/exec/load/ircd_server.js
index d36ea5eb60..a4ed81f239 100644
--- a/exec/load/ircd_server.js
+++ b/exec/load/ircd_server.js
@@ -454,7 +454,7 @@ function Server_Work() {
if (!test_server || (this.nick !=
test_server.parent)) {
if (debug && test_server)
- log("this.nick: " + this.nick + " test_server.parent: " + test_server.parent);
+ log(LOG_DEBUG,"this.nick: " + this.nick + " test_server.parent: " + test_server.parent);
umode_notice(USERMODE_OPER,"Notice","Server " + this.nick + " trying to introduce nick from server not behind it: " + cmd[1] + "@" + cmd[7]);
this.ircout("KILL " + cmd[1] + " :Invalid Origin.");
break;
diff --git a/exec/load/ircd_unreg.js b/exec/load/ircd_unreg.js
index 6cf9fdf4e1..29707be46c 100644
--- a/exec/load/ircd_unreg.js
+++ b/exec/load/ircd_unreg.js
@@ -108,7 +108,7 @@ function Unregistered_Commands() {
if ((cmdline[0] == "\r") || (cmdline[0] == "\n"))
cmdline = cmdline.slice(1);
if (debug)
- log("[UNREG]: " + cmdline);
+ log(LOG_DEBUG,"[UNREG]: " + cmdline);
cmd = cmdline.split(" ");
if (cmdline[0] == ":") {
// Silently ignore NULL originator commands.
diff --git a/exec/load/ircd_user.js b/exec/load/ircd_user.js
index fe14da775b..bc72164d8d 100644
--- a/exec/load/ircd_user.js
+++ b/exec/load/ircd_user.js
@@ -452,7 +452,7 @@ function User_Work() {
this.server_notice("Invalid DIE password.");
break;
}
- log("!ERROR! Shutting down the ircd as per " + this.nuh);
+ log(LOG_ERR,"!ERROR! Shutting down the ircd as per " + this.nuh);
js.terminated = true;
break;
case "ERROR":
diff --git a/exec/menu.js b/exec/menu.js
index 6749c1d569..5595ebc06a 100644
--- a/exec/menu.js
+++ b/exec/menu.js
@@ -19,7 +19,7 @@ function isdigit(ch)
function menu(fname)
{
if(!fname) {
- alert(log("!No menu file specified"));
+ alert(log(LOG_WARNING,"!No menu file specified"));
return(false);
}
@@ -35,7 +35,7 @@ function menu(fname)
var file = new File(system.exec_dir + fname);
if(!file.open("r")) {
- alert(log("!ERROR " + file.error + " opening " + fname));
+ alert(log(LOG_ERR,"!ERROR " + file.error + " opening " + fname));
return(false);
}
diff --git a/exec/newuser.js b/exec/newuser.js
index 59b6d6bb6f..e8698f226b 100644
--- a/exec/newuser.js
+++ b/exec/newuser.js
@@ -113,7 +113,7 @@ function send_newuser_welcome_msg(fname)
{
file = new File(fname);
if(!file.open("rt")) {
- log("!ERROR " + errno_str + " opening " + fname);
+ log(LOG_ERR,"!ERROR " + errno_str + " opening " + fname);
return(false);
}
msgtxt = lfexpand(file.read(file.length));
@@ -122,7 +122,7 @@ function send_newuser_welcome_msg(fname)
msgbase = new MsgBase("mail");
if(msgbase.open()==false) {
- log("!ERROR " + msgbase.last_error);
+ log(LOG_ERR,"!ERROR " + msgbase.last_error);
return(false);
}
@@ -135,9 +135,9 @@ function send_newuser_welcome_msg(fname)
};
if(!msgbase.save_msg(hdr, msgtxt))
- log("!ERROR " + msgbase.last_error + "saving mail message");
+ log(LOG_ERR,"!ERROR " + msgbase.last_error + "saving mail message");
- log("Sent new user welcome e-mail");
+ log(LOG_INFO,"Sent new user welcome e-mail");
msgbase.close();
}
\ No newline at end of file
diff --git a/exec/nntpservice.js b/exec/nntpservice.js
index 6ba1d30d66..c89585a0dc 100644
--- a/exec/nntpservice.js
+++ b/exec/nntpservice.js
@@ -130,7 +130,7 @@ while(client.socket.is_connected && !quit) {
cmdline = client.socket.recvline(512 /*maxlen*/, 300 /*timeout*/);
if(cmdline==null) {
- log("!TIMEOUT waiting for request");
+ log(LOG_WARNING,"!TIMEOUT waiting for request");
break;
}
@@ -196,7 +196,7 @@ while(client.socket.is_connected && !quit) {
if(!logged_in) {
if (auto_login) {
- log("Autologin Search: Started");
+ log(LOG_DEBUG,"Autologin Search: Started");
var oUser = new User(1);
sUser = false;
sPassword = ""
@@ -209,12 +209,12 @@ while(client.socket.is_connected && !quit) {
iLastOn = oUser.stats.laston_date;
sUser = oUser.alias;
sPassword = oUser.security.password;
- log("!Autologin Search: Match Found ("+sUser+")");
+ log(LOG_DEBUG,"!Autologin Search: Match Found ("+sUser+")");
}
}
oUser = null;
- log("Autologin Search: Finished");
+ log(LOG_DEBUG,"Autologin Search: Finished");
if (sUser)
login(sUser,sPassword);
@@ -222,7 +222,7 @@ while(client.socket.is_connected && !quit) {
if(!logged_in) {
writeln("502 Authentication required");
- log("!Authentication required");
+ log(LOG_WARNING,"!Authentication required");
continue;
}
}
@@ -326,7 +326,7 @@ while(client.socket.is_connected && !quit) {
}
if(!found) {
writeln("411 no such newsgroup");
- log("!no such group");
+ log(LOG_NOTICE,"!no such group");
bogus_cmd_counter++;
break;
}
@@ -640,7 +640,7 @@ while(client.socket.is_connected && !quit) {
line = client.socket.recvline(512 /*maxlen*/, 300 /*timeout*/);
if(line==null) {
- log("!TIMEOUT waiting for text line");
+ log(LOG_NOTICE,"!TIMEOUT waiting for text line");
break;
}
@@ -735,7 +735,7 @@ while(client.socket.is_connected && !quit) {
case "cancel":
target=msgbase.get_msg_header(ctrl_msg[1]);
if(target==null) {
- log("!Invalid Message-ID: " + ctrl_msg[1]);
+ log(LOG_NOTICE,"!Invalid Message-ID: " + ctrl_msg[1]);
break;
}
if(logged_in && ((target.from_ext==user.number
@@ -743,16 +743,16 @@ while(client.socket.is_connected && !quit) {
|| msg_area.grp_list[g].sub_list[s].is_operator)) {
if(msgbase.remove_msg(ctrl_msg[1])) {
posted=true;
- log("Message deleted: " + ctrl_msg[1]);
+ log(LOG_NOTICE,"Message deleted: " + ctrl_msg[1]);
} else
- log("!ERROR " + msgbase.error +
+ log(LOG_ERR,"!ERROR " + msgbase.error +
" deleting message: " + ctrl_msg[1]);
continue;
}
break;
}
}
- log("!Invalid control message: " + hdr.control);
+ log(LOG_WARNING,"!Invalid control message: " + hdr.control);
break;
}
@@ -775,14 +775,14 @@ while(client.socket.is_connected && !quit) {
if(posted)
writeln("240 article posted ok");
else {
- log("!post failure");
+ log(LOG_ERR,"!post failure");
writeln("441 posting failed");
}
break;
default:
writeln("500 Syntax error or unknown command");
- log("!unknown command");
+ log(LOG_NOTICE,"!unknown command");
break;
}
@@ -790,7 +790,7 @@ while(client.socket.is_connected && !quit) {
&& bogus_cmd_counter >= max_bogus_cmds) {
log(format("!TOO MANY BOGUS COMMANDS (%u)", bogus_cmd_counter));
if(filter_bogus_clients) {
- log("!FILTERING CLIENT'S IP ADDRESS: " + client.ip_address);
+ log(LOG_NOTICE,"!FILTERING CLIENT'S IP ADDRESS: " + client.ip_address);
system.filter_ip("NNTP","- TOO MANY BOGUS COMMANDS (Example: " + cmdline +")"
, client.host_name, client.ip_address, client.user_name);
}
diff --git a/exec/purgefiles.js b/exec/purgefiles.js
index d03f538734..9eb76c5146 100644
--- a/exec/purgefiles.js
+++ b/exec/purgefiles.js
@@ -29,7 +29,7 @@ for(i in files) {
continue;
print(system.datestr(t) + " " + files[i]);
if(!file_remove(files[i])) {
- log("!Error " + errno + " removing " + files[i]);
+ log(LOG_ERR,"!Error " + errno + " removing " + files[i]);
continue;
}
purged_files++;
diff --git a/exec/testbuild.js b/exec/testbuild.js
index aa726157f6..b11aa4cfbf 100644
--- a/exec/testbuild.js
+++ b/exec/testbuild.js
@@ -196,7 +196,7 @@ function send_email(subject, body)
{
var msgbase = new MsgBase("mail");
if(msgbase.open()==false) {
- log("!ERROR " + msgbase.last_error);
+ log(LOG_ERR,"!ERROR " + msgbase.last_error);
return(false);
}
--
GitLab