From: Chris Hofstaedtler Date: Wed, 10 Aug 2022 12:51:21 +0000 (+0200) Subject: Rename s_starttime, s_programname X-Git-Tag: rec-4.8.0-alpha1~20^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c509c9fad48a04a9b23ebb783c01a5c7ec648147;p=thirdparty%2Fpdns.git Rename s_starttime, s_programname --- diff --git a/pdns/auth-main.cc b/pdns/auth-main.cc index dbd7564012..d23bfa3035 100644 --- a/pdns/auth-main.cc +++ b/pdns/auth-main.cc @@ -88,9 +88,9 @@ #include "minicurl.hh" #endif /* HAVE_LUA_RECORDS */ -time_t s_starttime; +time_t g_starttime; -string s_programname = "pdns"; // used in packethandler.cc +string g_programname = "pdns"; // used in packethandler.cc const char* funnytext = "*****************************************************************************\n" "Ok, you just ran pdns_server through 'strings' hoping to find funny messages.\n" @@ -953,7 +953,7 @@ static void writePid() fname = ::arg()["chroot"] + ::arg()["socket-dir"]; } - fname += +"/" + s_programname + ".pid"; + fname += +"/" + g_programname + ".pid"; ofstream of(fname.c_str()); if (of) of << getpid() << endl; @@ -1011,7 +1011,7 @@ static int guardian(int argc, char** argv) int infd = 0, outfd = 1; - DynListener dlg(s_programname); + DynListener dlg(g_programname); dlg.registerFunc("QUIT", &DLQuitHandler, "quit daemon"); dlg.registerFunc("CYCLE", &DLCycleHandler, "restart instance"); dlg.registerFunc("PING", &DLPingHandler, "ping guardian"); @@ -1188,8 +1188,8 @@ int main(int argc, char** argv) versionSetProduct(ProductAuthoritative); reportAllTypes(); // init MOADNSParser - s_programname = "pdns"; - s_starttime = time(nullptr); + g_programname = "pdns"; + g_starttime = time(nullptr); #if defined(__GLIBC__) && !defined(__UCLIBC__) signal(SIGSEGV, tbhandler); @@ -1213,11 +1213,11 @@ int main(int argc, char** argv) } if (::arg()["config-name"] != "") - s_programname += "-" + ::arg()["config-name"]; + g_programname += "-" + ::arg()["config-name"]; - g_log.setName(s_programname); + g_log.setName(g_programname); - string configname = ::arg()["config-dir"] + "/" + s_programname + ".conf"; + string configname = ::arg()["config-dir"] + "/" + g_programname + ".conf"; cleanSlashes(configname); if (::arg()["config"] != "default" && !::arg().mustDo("no-config")) // "config" == print a configuration file @@ -1401,7 +1401,7 @@ int main(int argc, char** argv) if (::arg().mustDo("control-console")) g_DynListener = std::make_unique(); else - g_DynListener = std::make_unique(s_programname); + g_DynListener = std::make_unique(g_programname); writePid(); } diff --git a/pdns/auth-main.hh b/pdns/auth-main.hh index 5d194dc368..bfc53cf9ef 100644 --- a/pdns/auth-main.hh +++ b/pdns/auth-main.hh @@ -35,7 +35,7 @@ #include "tcpreceiver.hh" #include "dnsseckeeper.hh" -extern time_t s_starttime; +extern time_t g_starttime; extern ArgvMap theArg; extern StatBag S; //!< Statistics are gathered across PDNS via the StatBag class S extern AuthPacketCache PC; //!< This is the main PacketCache, shared across all threads diff --git a/pdns/dynhandler.cc b/pdns/dynhandler.cc index 9a27e33028..64037a3ba2 100644 --- a/pdns/dynhandler.cc +++ b/pdns/dynhandler.cc @@ -124,7 +124,7 @@ string DLStatusHandler(const vector&parts, Utility::pid_t ppid) string DLUptimeHandler(const vector&parts, Utility::pid_t ppid) { ostringstream os; - os< PacketHandler::s_forwardNotify; bool PacketHandler::s_SVCAutohints{false}; -extern string s_programname; +extern string g_programname; // See https://www.rfc-editor.org/rfc/rfc8078.txt and https://www.rfc-editor.org/errata/eid5049 for details const std::shared_ptr PacketHandler::s_deleteCDNSKEYContent = std::make_shared("0 3 0 AA=="); const std::shared_ptr PacketHandler::s_deleteCDSContent = std::make_shared("0 0 0 00"); -PacketHandler::PacketHandler():B(s_programname), d_dk(&B) +PacketHandler::PacketHandler():B(g_programname), d_dk(&B) { ++s_count; d_doDNAME=::arg().mustDo("dname-processing"); diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc index 60fe6a8a0e..5f80ab26c4 100644 --- a/pdns/pdnsutil.cc +++ b/pdns/pdnsutil.cc @@ -51,7 +51,7 @@ uint16_t g_maxNSEC3Iterations{0}; namespace po = boost::program_options; po::variables_map g_vm; -string s_programname="pdns"; +string g_programname="pdns"; namespace { bool g_verbose; @@ -90,9 +90,9 @@ static void loadMainConfig(const std::string& configdir) } if(::arg()["config-name"]!="") - s_programname+="-"+::arg()["config-name"]; + g_programname+="-"+::arg()["config-name"]; - string configname=::arg()["config-dir"]+"/"+s_programname+".conf"; + string configname=::arg()["config-dir"]+"/"+g_programname+".conf"; cleanSlashes(configname); ::arg().set("resolver","Use this resolver for ALIAS and the internal stub resolver")="no"; diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc index 733a127f89..648938d31f 100644 --- a/pdns/ws-auth.cc +++ b/pdns/ws-auth.cc @@ -240,7 +240,7 @@ void AuthWebServer::indexfunction(HttpRequest* req, HttpResponse* resp) ret<<"
"; ret<
)"; - time_t passed=time(nullptr)-s_starttime; + time_t passed=time(nullptr)-g_starttime; ret<<"

Uptime: "<< humanDuration(passed)<< @@ -516,7 +516,7 @@ void productServerStatisticsFetch(map& out) } // add uptime - out["uptime"] = std::to_string(time(nullptr) - s_starttime); + out["uptime"] = std::to_string(time(nullptr) - g_starttime); } std::optional productServerStatisticsFetch(const std::string& name)