diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/channels.cpp | 2 | ||||
| -rw-r--r-- | src/config.cpp | 42 | ||||
| -rw-r--r-- | src/init.cpp | 7 | ||||
| -rw-r--r-- | src/ircd.cpp | 11 | ||||
| -rw-r--r-- | src/logger.cpp | 2 |
5 files changed, 26 insertions, 38 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index 506dbfc7d..29cc2c895 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -1252,7 +1252,7 @@ void do_cmode(const Anope::string &source, int ac, const char **av) unsigned i, end; const char *t; - if (Capab.HasFlag(CAPAB_TSMODE) || UseTSMODE) + if (Capab.HasFlag(CAPAB_TSMODE)) { for (i = 0, end = strlen(av[1]); i < end; ++i) if (!isdigit(av[1][i])) diff --git a/src/config.cpp b/src/config.cpp index 3526f6636..612aecf66 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -835,33 +835,30 @@ bool InitLogs(ServerConfig *config, const Anope::string &) { LogInfo *l = config->LogInfos[i]; - if (l->Inhabit) + for (std::list<Anope::string>::const_iterator sit = l->Targets.begin(), sit_end = l->Targets.end(); sit != sit_end; ++sit) { - for (std::list<Anope::string>::const_iterator sit = l->Targets.begin(), sit_end = l->Targets.end(); sit != sit_end; ++sit) - { - const Anope::string &target = *sit; + const Anope::string &target = *sit; - if (target[0] == '#') + if (target[0] == '#') + { + Channel *c = findchan(target); + if (c && c->HasFlag(CH_LOGCHAN)) { - Channel *c = findchan(target); - if (c && c->HasFlag(CH_LOGCHAN)) + for (CUserList::const_iterator cit = c->users.begin(), cit_end = c->users.end(); cit != cit_end; ++cit) { - for (CUserList::const_iterator cit = c->users.begin(), cit_end = c->users.end(); cit != cit_end; ++cit) - { - UserContainer *uc = *cit; - BotInfo *bi = findbot(uc->user->nick); + UserContainer *uc = *cit; + BotInfo *bi = findbot(uc->user->nick); - if (bi && bi->HasFlag(BI_CORE)) - { - bi->Part(c, "Reloading"); - } + if (bi && bi->HasFlag(BI_CORE)) + { + bi->Part(c, "Reloading configuration"); } - - c->UnsetFlag(CH_PERSIST); - c->UnsetFlag(CH_LOGCHAN); - if (c->users.empty()) - delete c; } + + c->UnsetFlag(CH_PERSIST); + c->UnsetFlag(CH_LOGCHAN); + if (c->users.empty()) + delete c; } } } @@ -875,7 +872,7 @@ bool InitLogs(ServerConfig *config, const Anope::string &) bool DoLogs(ServerConfig *config, const Anope::string &, const Anope::string *, ValueList &values, int *) { - //{"target", "source", "logage", "admin", "override", "commands", "servers", "channels", "users", "normal", "rawio", "debug"}, + //{"target", "source", "logage", "inhabit", "admin", "override", "commands", "servers", "channels", "users", "normal", "rawio", "debug"}, Anope::string targets = values[0].GetValue(); ValueItem vi(targets); if (!ValidateNotEmpty(config, "log", "target", vi)) @@ -911,7 +908,8 @@ bool DoLogs(ServerConfig *config, const Anope::string &, const Anope::string *, bool DoneLogs(ServerConfig *config, const Anope::string &) { - InitLogChannels(config); + if (ircd) + InitLogChannels(config); Log() << "Loaded " << config->LogInfos.size() << " log blocks"; diff --git a/src/init.cpp b/src/init.cpp index 5b6d22445..94cf37ce9 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -54,8 +54,6 @@ void introduce_user(const Anope::string &user) /* Load MLock from the database now that we know what modes exist */ for (registered_channel_map::iterator it = RegisteredChannelList.begin(), it_end = RegisteredChannelList.end(); it != it_end; ++it) it->second->LoadMLock(); - /* Setup log chanels */ - InitLogChannels(Config); } } @@ -355,6 +353,9 @@ void Init(int ac, char **av) if (!Config->s_GlobalNoticer.empty()) new BotInfo(Config->s_GlobalNoticer, Config->ServiceUser, Config->ServiceHost, Config->desc_GlobalNoticer); + /* Init the log channels */ + InitLogChannels(Config); + /* Add Encryption Modules */ ModuleManager::LoadModuleList(Config->EncModuleList); @@ -404,7 +405,7 @@ void Init(int ac, char **av) write_pidfile(); /* Announce ourselves to the logfile. */ - Log() << "Anope " << Anope::Version() << " (ircd protocol: " << version_protocol << ") starting up" << (debug || readonly ? " (options:" : "") << (debug ? " debug" : "") << (readonly ? " readonly" : "") << (debug || readonly ? ")" : ""); + Log() << "Anope " << Anope::Version() << " (ircd protocol: " << ircd->name << ") starting up" << (debug || readonly ? " (options:" : "") << (debug ? " debug" : "") << (readonly ? " readonly" : "") << (debug || readonly ? ")" : ""); start_time = time(NULL); /* Set signal handlers. Catch certain signals to let us do things or diff --git a/src/ircd.cpp b/src/ircd.cpp index e6ac76079..edab02be4 100644 --- a/src/ircd.cpp +++ b/src/ircd.cpp @@ -18,8 +18,6 @@ IRCDProto *ircdproto; * Globals we want from the protocol file **/ IRCDVar *ircd; -Anope::string version_protocol; -int UseTSMODE; void pmodule_ircd_proto(IRCDProto *proto) { @@ -34,12 +32,3 @@ void pmodule_ircd_var(IRCDVar *ircdvar) ircd = ircdvar; } -void pmodule_ircd_version(const Anope::string &version) -{ - version_protocol = version; -} - -void pmodule_ircd_useTSMode(int use) -{ - UseTSMODE = use; -} diff --git a/src/logger.cpp b/src/logger.cpp index 92b87279d..de5e58c32 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -17,7 +17,7 @@ void InitLogChannels(ServerConfig *config) { LogInfo *l = config->LogInfos[i]; - if (!l->Inhabit) + if (!ircd->join2msg && !l->Inhabit) continue; for (std::list<Anope::string>::const_iterator sit = l->Targets.begin(), sit_end = l->Targets.end(); sit != sit_end; ++sit) |