Remove the 'debug' snotice character.

diff --git a/docs/conf/helpop-full.conf.example b/docs/conf/helpop-full.conf.example
index 5705cad8ec78b55ffe63a50043a98926a2b6eb29..6d0ea10e99d12c57bb08ff56bd095b214006b58a 100644 (file)
--- a/docs/conf/helpop-full.conf.example
+++ b/docs/conf/helpop-full.conf.example
@@ -1047,7 +1047,6 @@ Note that all /STATS use is broadcast to online IRC operators.">
  A      Allows receipt of remote announcement messages.
  c      Allows receipt of local connect messages.
  C      Allows receipt of remote connect messages.
- d      Allows receipt of general (and sometimes random) debug messages.
  f      Allows receipt of flooding notices.
  g      Allows receipt of globops (requires the globops module).
  j      Allows receipt of channel creation notices (requires the chancreate module).

diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf.example
index 25253c1399726dbb59b4831850a0e5541acf6adf..ada39c61de2eaa892929f425bc7ff960759ff48e 100644 (file)
--- a/docs/conf/helpop.conf.example
+++ b/docs/conf/helpop.conf.example
@@ -237,7 +237,6 @@ help channel if you have any questions.">
  A      Allows receipt of remote announcement messages.
  c      Allows receipt of local connect messages.
  C      Allows receipt of remote connect messages.
- d      Allows receipt of general (and sometimes random) debug messages.
  f      Allows receipt of flooding notices.
  g      Allows receipt of globops (requires the globops module).
  j      Allows receipt of channel creation notices (requires the chancreate module).

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 8ebdc3b58958bcf8c2a2fd5dc69c6f4bcea829d0..bb27c718ef4202e69bfc78f499dd826423f63a3f 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -637,11 +637,11 @@ void InspIRCd::Run()
                        /* Allow a buffer of two seconds drift on this so that ntpdate etc dont harass admins */
                        if (TIME.tv_sec < OLDTIME - 2)
                        {
-                               SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %lu secs.", (unsigned long)(OLDTIME-TIME.tv_sec));
+                               SNO->WriteToSnoMask('a', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %lu secs.", (unsigned long)(OLDTIME-TIME.tv_sec));
                        }
                        else if (TIME.tv_sec > OLDTIME + 2)
                        {
-                               SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is jumping FORWARDS! Clock skipped %lu secs.", (unsigned long)(TIME.tv_sec - OLDTIME));
+                               SNO->WriteToSnoMask('a', "\002EH?!\002 -- Time is jumping FORWARDS! Clock skipped %lu secs.", (unsigned long)(TIME.tv_sec - OLDTIME));
                        }
 
                        OLDTIME = TIME.tv_sec;

diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index cd11b8d581b6371a1934d059a2c35defd84431db..00ef5b8d15b0b58fee4bf5fae24807622df0b642 100644 (file)
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -31,7 +31,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params)
 
        if (!xlf)
        {
-               ServerInstance->SNO->WriteToSnoMask('d',"%s sent me an unknown ADDLINE type (%s).",setter.c_str(),params[0].c_str());
+               ServerInstance->SNO->WriteToSnoMask('x',"%s sent me an unknown ADDLINE type (%s).",setter.c_str(),params[0].c_str());
                return CMD_FAILURE;
        }
 
@@ -42,7 +42,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params)
        }
        catch (ModuleException &e)
        {
-               ServerInstance->SNO->WriteToSnoMask('d',"Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason().c_str());
+               ServerInstance->SNO->WriteToSnoMask('x',"Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason().c_str());
                return CMD_FAILURE;
        }
        xl->SetCreateTime(ConvToInt(params[3]));

diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index 0f7f5814c1d92286264db267bedff5540bfb4981..61c5313a82b5af66870c16e325848f70ddd769cc 100644 (file)
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -133,7 +133,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, Params& params)
                time_t ourTS = chan->age;
                if (TS != ourTS)
                {
-                       ServerInstance->SNO->WriteToSnoMask('d', "Merge FJOIN received for %s, ourTS: %lu, TS: %lu, difference: %ld",
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Merge FJOIN received for %s, ourTS: %lu, TS: %lu, difference: %ld",
                                chan->name.c_str(), (unsigned long)ourTS, (unsigned long)TS, (long)(ourTS - TS));
                        /* If our TS is less than theirs, we dont accept their modes */
                        if (ourTS < TS)

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 98f16528e4ee9652dcec37981bda49efc9e9f698..0b266ff7e44c6420b9a437b047c4d58a9d94f939 100644 (file)
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -70,7 +70,6 @@ SnomaskManager::SnomaskManager()
        EnableSnomask('k',"KILL");                      /* Kill notices */
        EnableSnomask('o',"OPER");                      /* Oper up/down notices */
        EnableSnomask('a',"ANNOUNCEMENT");      /* formerly WriteOpers() - generic notices to all opers */
-       EnableSnomask('d',"DEBUG");                     /* Debug notices */
        EnableSnomask('x',"XLINE");                     /* Xline notice (g/z/q/k/e) */
        EnableSnomask('t',"STATS");                     /* Local or remote stats request */
 }