diff options
| author |  Peter Powell | 2017-10-12 15:55:21 +0100 |
|---|---|---|
| committer | Peter Powell | 2017-10-12 15:55:21 +0100 |
| commit | a3e0768758ca68429a29d9c78ce672f2d938c6e7 (patch) | |
| tree | a66b4c4f917d56e1cef8ffda450d535ea532be35 /src/inspircd.cpp | |
| parent | Merge pull request #1361 from genius3000/master+rline_IP (diff) | |
| parent | Include connection security with the SASL host information. (diff) | |
Merge the latest changes from insp20 into master.
Diffstat (limited to 'src/inspircd.cpp')
| -rw-r--r-- | src/inspircd.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp index bc0875502..47660f752 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -642,8 +642,15 @@ void InspIRCd::Run() OLDTIME = TIME.tv_sec; if ((TIME.tv_sec % 3600) == 0) + { FOREACH_MOD(OnGarbageCollect, ()); + // HACK: ELines are not expired properly at the moment but it can't be fixed as + // the 2.0 XLine system is a spaghetti nightmare. Instead we skip over expired + // ELines in XLineManager::CheckELines() and expire them here instead. + XLines->GetAll("E"); + } + Timers.TickTimers(TIME.tv_sec); Users->DoBackgroundUserStuff(); |