diff options
| author | Peter Powell <petpow@saberuk.com> | 2017-10-15 02:15:35 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2017-10-15 11:57:05 +0100 |
| commit | 4743b23e5c15cd2a9cb86f857e1b7199533201bb (patch) | |
| tree | 8438fa8376a0214b653d625a27272e8e1c73d66f /src | |
| parent | c5d9b2d6c14414b8933c2e7f60995ca7b01a2d05 (diff) | |
Remove INSPIRCD_SOCKETENGINE_NAME and INSPIRCD_SYSTEM.
- INSPIRCD_SOCKETENGINE_NAME is not really something that needs to
be user facing. If opers want to know this kind of internal info
then they can look at the build configuration.
- INSPIRCD_SYSTEM causes problems for reproducible builds and is
only accurate for the state of the system when InspIRCd is built
which is not useful in the slightest.
Diffstat (limited to 'src')
| -rw-r--r-- | src/logger.cpp | 3 | ||||
| -rw-r--r-- | src/modules/m_httpd_stats.cpp | 2 | ||||
| -rw-r--r-- | src/server.cpp | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/logger.cpp b/src/logger.cpp index e3e956325..6fa972c73 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -50,8 +50,7 @@ */ const char LogStream::LogHeader[] = - "Log started for " INSPIRCD_VERSION " (" MODULE_INIT_STR ")" - " - compiled on " INSPIRCD_SYSTEM; + "Log started for " INSPIRCD_VERSION " (" MODULE_INIT_STR ")"; LogManager::LogManager() : Logging(false) diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index 41d85a3b4..de5a61e4d 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -105,7 +105,7 @@ class ModuleHttpStats : public Module, public HTTPRequestEventListener data << "<usercount>" << ServerInstance->Users->GetUsers().size() << "</usercount>"; data << "<channelcount>" << ServerInstance->GetChans().size() << "</channelcount>"; data << "<opercount>" << ServerInstance->Users->all_opers.size() << "</opercount>"; - data << "<socketcount>" << (SocketEngine::GetUsedFds()) << "</socketcount><socketmax>" << SocketEngine::GetMaxFds() << "</socketmax><socketengine>" INSPIRCD_SOCKETENGINE_NAME "</socketengine>"; + data << "<socketcount>" << (SocketEngine::GetUsedFds()) << "</socketcount><socketmax>" << SocketEngine::GetMaxFds() << "</socketmax>"; data << "<uptime><boot_time_t>" << ServerInstance->startup_time << "</boot_time_t></uptime>"; data << "<isupport>"; diff --git a/src/server.cpp b/src/server.cpp index f18c9c86c..1a92c13a0 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -64,8 +64,8 @@ void InspIRCd::Rehash(const std::string& uuid) std::string InspIRCd::GetVersionString(bool getFullVersion) { if (getFullVersion) - return INSPIRCD_VERSION " " + Config->ServerName + " :" INSPIRCD_SYSTEM " [" INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]"; - return INSPIRCD_BRANCH " " + Config->ServerName + " :" + Config->CustomVersion; + return INSPIRCD_VERSION ". " + Config->ServerName + " :[" + Config->sid + "] " + Config->CustomVersion; + return INSPIRCD_BRANCH ". " + Config->ServerName + " :" + Config->CustomVersion; } std::string UIDGenerator::GenerateSID(const std::string& servername, const std::string& serverdesc) |