Sort registration of pdns_control actions. NFC

Signed-off-by: Miod Vallat <miod.vallat@powerdns.com>

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index 9ea4d9e54c3250dc0cafb474a7abc61f1d2ff682..f1e33d445edbe678aa5ec03a8aea103485d2c41d 100644 (file)
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -843,11 +843,11 @@ Bind2Backend::Bind2Backend(const string& suffix, bool loadZones)
     s_first = 0;
   }
 
-  DynListener::registerFunc("BIND-RELOAD-NOW", &DLReloadNowHandler, "bindbackend: reload domains", "<domains>");
-  DynListener::registerFunc("BIND-DOMAIN-STATUS", &DLDomStatusHandler, "bindbackend: list status of all domains", "[domains]");
+  DynListener::registerFunc("BIND-ADD-ZONE", &DLAddDomainHandler, "bindbackend: add zone", "<domain> <filename>");
   DynListener::registerFunc("BIND-DOMAIN-EXTENDED-STATUS", &DLDomExtendedStatusHandler, "bindbackend: list the extended status of all domains", "[domains]");
+  DynListener::registerFunc("BIND-DOMAIN-STATUS", &DLDomStatusHandler, "bindbackend: list status of all domains", "[domains]");
   DynListener::registerFunc("BIND-LIST-REJECTS", &DLListRejectsHandler, "bindbackend: list rejected domains");
-  DynListener::registerFunc("BIND-ADD-ZONE", &DLAddDomainHandler, "bindbackend: add zone", "<domain> <filename>");
+  DynListener::registerFunc("BIND-RELOAD-NOW", &DLReloadNowHandler, "bindbackend: reload domains", "<domains>");
 }
 
 Bind2Backend::~Bind2Backend()

diff --git a/pdns/auth-main.cc b/pdns/auth-main.cc
index ce8a785b6d1e20d390dd25e62815dc586469c464..ce1c9f2df3aabd0fa4e7ad789e304129c15dc3e4 100644 (file)
--- a/pdns/auth-main.cc
+++ b/pdns/auth-main.cc
@@ -1453,25 +1453,25 @@ int main(int argc, char** argv)
 
       writePid();
     }
-    DynListener::registerFunc("SHOW", &DLShowHandler, "show a specific statistic or * to get a list", "<statistic>");
-    DynListener::registerFunc("RPING", &DLPingHandler, "ping instance");
     DynListener::registerExitFunc("QUIT", &DLRQuitHandler);
-    DynListener::registerFunc("UPTIME", &DLUptimeHandler, "get instance uptime");
-    DynListener::registerFunc("NOTIFY-HOST", &DLNotifyHostHandler, "notify host for specific zone", "<zone> <host>");
+    DynListener::registerFunc("CCOUNTS", &DLCCHandler, "get cache statistics");
+    DynListener::registerFunc("CURRENT-CONFIG", &DLCurrentConfigHandler, "retrieve the current configuration", "[diff]");
+    DynListener::registerFunc("LIST-ZONES", &DLListZones, "show list of zones", "[primary|secondary|native|consumer|producer]");
     DynListener::registerFunc("NOTIFY", &DLNotifyHandler, "queue a notification", "<zone>");
-    DynListener::registerFunc("RELOAD", &DLReloadHandler, "reload all zones");
-    DynListener::registerFunc("REDISCOVER", &DLRediscoverHandler, "discover any new zones");
-    DynListener::registerFunc("VERSION", &DLVersionHandler, "get instance version");
+    DynListener::registerFunc("NOTIFY-HOST", &DLNotifyHostHandler, "notify host for specific zone", "<zone> <host>");
     DynListener::registerFunc("PURGE", &DLPurgeHandler, "purge entries from packet cache", "[<record>]");
-    DynListener::registerFunc("CCOUNTS", &DLCCHandler, "get cache statistics");
     DynListener::registerFunc("QTYPES", &DLQTypesHandler, "get QType statistics");
-    DynListener::registerFunc("RESPSIZES", &DLRSizesHandler, "get histogram of response sizes");
+    DynListener::registerFunc("REDISCOVER", &DLRediscoverHandler, "discover any new zones");
+    DynListener::registerFunc("RELOAD", &DLReloadHandler, "reload all zones");
     DynListener::registerFunc("REMOTES", &DLRemotesHandler, "get top remotes");
-    DynListener::registerFunc("SET", &DLSettingsHandler, "set config variables", "<var> <value>");
+    DynListener::registerFunc("RESPSIZES", &DLRSizesHandler, "get histogram of response sizes");
     DynListener::registerFunc("RETRIEVE", &DLNotifyRetrieveHandler, "retrieve secondary zone", "<zone> [<ip>]");
-    DynListener::registerFunc("CURRENT-CONFIG", &DLCurrentConfigHandler, "retrieve the current configuration", "[diff]");
-    DynListener::registerFunc("LIST-ZONES", &DLListZones, "show list of zones", "[primary|secondary|native|consumer|producer]");
+    DynListener::registerFunc("RPING", &DLPingHandler, "ping instance");
+    DynListener::registerFunc("SET", &DLSettingsHandler, "set config variables", "<var> <value>");
+    DynListener::registerFunc("SHOW", &DLShowHandler, "show a specific statistic or * to get a list", "<statistic>");
     DynListener::registerFunc("TOKEN-LOGIN", &DLTokenLogin, "Login to a PKCS#11 token", "<module> <slot> <pin>");
+    DynListener::registerFunc("UPTIME", &DLUptimeHandler, "get instance uptime");
+    DynListener::registerFunc("VERSION", &DLVersionHandler, "get instance version");
     DynListener::registerFunc("XFR-QUEUE", &DLSuckRequests, "Get all requests for XFR in queue");
 
     if (!::arg()["tcp-control-address"].empty()) {

diff --git a/pdns/dynhandler.hh b/pdns/dynhandler.hh
index 8bcf8c5744b4adfb6b86f19ce5102c3495fd26fa..8c6faf0a11fa6bda2e530f88450388bbcfdfae72 100644 (file)
--- a/pdns/dynhandler.hh
+++ b/pdns/dynhandler.hh
@@ -32,26 +32,26 @@
 
 bool DLQuitPlease();
 void setStatus(const string &str);
-string DLQuitHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLRQuitHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLPingHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLShowHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLUptimeHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLSettingsHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLRespSizeHandler(const vector<string>&parts, Utility::pid_t ppid);
 string DLCCHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLCurrentConfigHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLListZones(const vector<string>&parts, Utility::pid_t ppid);
+string DLNotifyHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLNotifyHostHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLNotifyRetrieveHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLPingHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLPurgeHandler(const vector<string>&parts, Utility::pid_t ppid);
 string DLQTypesHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLQuitHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLRQuitHandler(const vector<string>&parts, Utility::pid_t ppid);
 string DLRSizesHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLRediscoverHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLReloadHandler(const vector<string>&parts, Utility::pid_t ppid);
 string DLRemotesHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLRespSizeHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLSettingsHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLShowHandler(const vector<string>&parts, Utility::pid_t ppid);
 string DLStatusHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLNotifyHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLNotifyHostHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLReloadHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLRediscoverHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLVersionHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLPurgeHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLNotifyRetrieveHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLCurrentConfigHandler(const vector<string>&parts, Utility::pid_t ppid);
-string DLListZones(const vector<string>&parts, Utility::pid_t ppid);
-string DLTokenLogin(const vector<string>&parts, Utility::pid_t ppid);
 string DLSuckRequests(const vector<string> &parts, Utility::pid_t ppid);
+string DLTokenLogin(const vector<string>&parts, Utility::pid_t ppid);
+string DLUptimeHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLVersionHandler(const vector<string>&parts, Utility::pid_t ppid);