summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorattilamolnar <attilamolnar@hush.com>2013-09-08 17:21:01 +0200
committerattilamolnar <attilamolnar@hush.com>2013-09-08 17:21:01 +0200
commitdeb18ee9cfa531a87141aea61171c6899ef7d687 (patch)
tree1ec3176daed470b8b44e08b7bbc2f861457a9368 /include
parent992674362c5f64bdb8e1942eeaa7612524529cd6 (diff)
Remove InspIRCd::HandleRehash functor
Call InspIRCd::Rehash() from cmd_rehash and from the SIGHUP handler
Diffstat (limited to 'include')
-rw-r--r--include/inspircd.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/include/inspircd.h b/include/inspircd.h
index 2e4b02fac..f43141c38 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -245,7 +245,6 @@ DEFINE_HANDLER1(IsNickHandler, bool, const std::string&);
DEFINE_HANDLER2(GenRandomHandler, void, char*, size_t);
DEFINE_HANDLER1(IsIdentHandler, bool, const std::string&);
DEFINE_HANDLER1(IsChannelHandler, bool, const std::string&);
-DEFINE_HANDLER1(RehashHandler, void, const std::string&);
DEFINE_HANDLER3(OnCheckExemptionHandler, ModResult, User*, Channel*, const std::string&);
/** The main class of the irc server.
@@ -296,7 +295,6 @@ class CoreExport InspIRCd
IsIdentHandler HandleIsIdent;
OnCheckExemptionHandler HandleOnCheckExemption;
IsChannelHandler HandleIsChannel;
- RehashHandler HandleRehash;
GenRandomHandler HandleGenRandom;
/** Globally accessible fake user record. This is used to force mode changes etc across s2s, etc.. bit ugly, but.. better than how this was done in 1.1
@@ -483,10 +481,6 @@ class CoreExport InspIRCd
*/
static bool IsSID(const std::string& sid);
- /** Rehash the local server
- */
- caller1<void, const std::string&> Rehash;
-
/** Handles incoming signals after being set
* @param signal the signal recieved
*/
@@ -583,8 +577,9 @@ class CoreExport InspIRCd
static void ProcessColors(file_cache& input);
/** Rehash the local server
+ * @param uuid The uuid of the user who started the rehash, can be empty
*/
- void RehashServer();
+ void Rehash(const std::string& uuid = "");
/** Check if the given nickmask matches too many users, send errors to the given user
* @param nick A nickmask to match against