diff options
| -rw-r--r-- | data/example.conf | 7 | ||||
| -rw-r--r-- | src/logger.cpp | 4 | ||||
| -rw-r--r-- | src/users.cpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/data/example.conf b/data/example.conf index 9c0e00e66..a4ba7ca82 100644 --- a/data/example.conf +++ b/data/example.conf @@ -579,8 +579,9 @@ log * debug - Debug messages (log files can become VERY large from this). * * These options determine what messages from the categories should be logged. Wildcards are accepted, and - * you can also negate values with a ~. For example, "operserv/* ~operserv/akill" would log all operserv - * messages except for operserv/akill. + * you can also negate values with a ~. For example, "~operserv/akill operserv/*" would log all operserv + * messages except for operserv/akill. Note that processing stops at the first matching option, which + * means "* ~operserv/*" would log everything because * matches everything. * * Valid admin, override, and command options are: * pesudo-serv/commandname (eg, operserv/akill, chanserv/set) @@ -1043,7 +1044,7 @@ chanserv * The core modules to load for ChanServ. This is a space separated list that corresponds * to the base names of the modules for ChanServ. This directive is optional, but highly recommended. */ - modules = "cs_help cs_register cs_set cs_saset cs_set_bantype cs_set_description cs_set_entrymsg cs_set_founder cs_set_keeptopic cs_set_mlock cs_set_opnotice cs_set_peace cs_set_persist cs_set_private cs_set_restricted cs_set_secure cs_set_securefounder cs_set_secureops cs_set_signkick cs_set_successor cs_set_topiclock cs_set_xop cs_xop cs_access cs_akick cs_drop cs_ban cs_clear cs_modes cs_getkey cs_invite cs_kick cs_list cs_topic cs_info cs_forbid cs_suspend cs_status cs_unban" + modules = "cs_help cs_register cs_set cs_saset cs_saset_noexpire cs_set_bantype cs_set_description cs_set_entrymsg cs_set_founder cs_set_keeptopic cs_set_mlock cs_set_opnotice cs_set_peace cs_set_persist cs_set_private cs_set_restricted cs_set_secure cs_set_securefounder cs_set_secureops cs_set_signkick cs_set_successor cs_set_topiclock cs_set_xop cs_xop cs_access cs_akick cs_drop cs_ban cs_clear cs_modes cs_getkey cs_invite cs_kick cs_list cs_topic cs_info cs_forbid cs_suspend cs_status cs_unban" /* * The default options for newly registered channels. Note that changing these options diff --git a/src/logger.cpp b/src/logger.cpp index 3f1f35735..58183c8b0 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -184,10 +184,10 @@ Log::Log(Server *s, const Anope::string &category) : bi(OperServ), Type(LOG_SERV buf << "SERVER: " << s->GetName() << " (" << s->GetDescription() << ") "; } -Log::Log(BotInfo *b, const Anope::string &category) : bi(b), Type(LOG_USER), Category(category) +Log::Log(BotInfo *b, const Anope::string &category) : bi(b), Type(LOG_NORMAL), Category(category) { if (!b) - b = Global; + this->bi = Global; if (this->bi) this->Sources.push_back(bi->nick); } diff --git a/src/users.cpp b/src/users.cpp index ae9c59a75..6ab771ec1 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -839,7 +839,7 @@ User *do_nick(const Anope::string &source, const Anope::string &nick, const Anop do_on_id(user); ircdproto->SetAutoIdentificationToken(user); user->SetMode(NickServ, UMODE_REGISTERED); - Log() << Config->s_NickServ << ": " << user->GetMask() << " automatically identified for group " << user->Account()->display; + Log(NickServ) << user->GetMask() << " automatically identified for group " << user->Account()->display; } if (ircd->sqline) |