char -> bool cleanup in Conf

This commit is contained in:
Brian Rasmusson
2016-10-21 10:40:49 +02:00
parent a4b9537320
commit 387e430851
3 changed files with 90 additions and 90 deletions

@ -86,7 +86,7 @@ Conf::Conf ( ) {
max_docid_splits = 0;
m_msg40_msg39_timeout = 0;
m_msg3a_msg39_network_overhead = 0;
m_useHighFrequencyTermCache = 0;
m_useHighFrequencyTermCache = false;
m_spideringEnabled = false;
m_injectionsEnabled = false;
m_queryingEnabled = false;
@ -145,10 +145,10 @@ Conf::Conf ( ) {
memset(m_errstr1, 0, sizeof(m_errstr1));
memset(m_errstr2, 0, sizeof(m_errstr2));
memset(m_errstr3, 0, sizeof(m_errstr3));
m_sendParmChangeAlertsToEmail1 = 0;
m_sendParmChangeAlertsToEmail2 = 0;
m_sendParmChangeAlertsToEmail3 = 0;
m_sendParmChangeAlertsToEmail4 = 0;
m_sendParmChangeAlertsToEmail1 = false;
m_sendParmChangeAlertsToEmail2 = false;
m_sendParmChangeAlertsToEmail3 = false;
m_sendParmChangeAlertsToEmail4 = false;
m_avgQueryTimeThreshold = 0.0;
m_querySuccessThreshold = 0.0;
m_numQueryTimes = 0;
@ -268,13 +268,13 @@ Conf::Conf ( ) {
m_logReminders = false;
m_generateVectorAtQueryTime = false;
memset(m_redirect, 0, sizeof(m_redirect));
m_useCompressionProxy = 0;
m_gzipDownloads = 0;
m_useTmpCluster = 0;
m_timeSyncProxy = 0;
m_useCompressionProxy = false;
m_gzipDownloads = false;
m_useTmpCluster = false;
m_timeSyncProxy = false;
m_interfaceMachine = false;
m_allowScale = true;
m_giveupOnDeadHosts = 0;
m_giveupOnDeadHosts = false;
m_bypassValidation = false;
m_maxHeartbeatDelay = 0;
m_maxCallbackDelay = 0;

158
Conf.h

@ -41,14 +41,14 @@ class Conf {
Conf();
bool isCollAdmin ( TcpSocket *socket , HttpRequest *hr ) ;
bool isCollAdmin ( TcpSocket *socket , HttpRequest *hr );
bool isCollAdminForColl (TcpSocket *sock, HttpRequest *hr, const char *coll );
bool isCollAdmin2 (TcpSocket *socket , HttpRequest *hr,
class CollectionRec *cr) ;
class CollectionRec *cr);
bool isMasterAdmin ( TcpSocket *socket , HttpRequest *hr ) ;
bool hasMasterPwd ( HttpRequest *hr ) ;
bool isMasterAdmin ( TcpSocket *socket , HttpRequest *hr );
bool hasMasterPwd ( HttpRequest *hr );
bool isMasterIp ( uint32_t ip );
bool isConnectIp ( uint32_t ip );
@ -83,13 +83,13 @@ class Conf {
// an additional strip directory on a different drive
char m_stripeDir[256];
char m_defaultColl [ MAX_COLL_LEN + 1 ];
char m_defaultColl[MAX_COLL_LEN + 1];
char m_clusterName[32];
// . dns parameters
// . dnsDir should hold our saved cached (TODO: save the dns cache)
int32_t m_numDns ;
int32_t m_numDns;
int32_t m_dnsIps[MAX_DNSIPS];
int16_t m_dnsPorts[MAX_DNSIPS];
@ -162,15 +162,15 @@ class Conf {
int64_t m_msg40_msg39_timeout; //timeout for entire get-docid-list phase, in milliseconds.
int64_t m_msg3a_msg39_network_overhead; //additional latency/overhead of sending reqeust+response over network.
char m_useHighFrequencyTermCache;
bool m_useHighFrequencyTermCache;
bool m_spideringEnabled ;
bool m_injectionsEnabled ;
bool m_queryingEnabled ;
bool m_spideringEnabled;
bool m_injectionsEnabled;
bool m_queryingEnabled;
bool m_returnResultsAnyway;
bool m_addUrlEnabled ; // TODO: use at http interface level
bool m_doStripeBalancing ;
bool m_addUrlEnabled; // TODO: use at http interface level
bool m_doStripeBalancing;
// . true if the server is on the production cluster
// . we enforce the 'elvtune -w 32 /dev/sd?' cmd on all drives because
@ -183,13 +183,13 @@ class Conf {
int32_t m_indexdbMaxIndexListAge;
// TODO: parse these out!!!!
int32_t m_httpMaxSockets ;
int32_t m_httpsMaxSockets ;
int32_t m_httpMaxSendBufSize ;
int32_t m_httpMaxSockets;
int32_t m_httpsMaxSockets;
int32_t m_httpMaxSendBufSize;
// a search results cache (for Msg40)
int32_t m_searchResultsMaxCacheMem ;
int32_t m_searchResultsMaxCacheAge ; // in seconds
int32_t m_searchResultsMaxCacheMem;
int32_t m_searchResultsMaxCacheAge; // in seconds
int64_t m_docSummaryWithDescriptionMaxCacheAge; //cache timeout for document summaries for documents with a meta-tag with description, in milliseconds
// for Weights.cpp
@ -253,10 +253,10 @@ class Conf {
char m_errstr2[MAX_URL_LEN];
char m_errstr3[MAX_URL_LEN];
char m_sendParmChangeAlertsToEmail1;
char m_sendParmChangeAlertsToEmail2;
char m_sendParmChangeAlertsToEmail3;
char m_sendParmChangeAlertsToEmail4;
bool m_sendParmChangeAlertsToEmail1;
bool m_sendParmChangeAlertsToEmail2;
bool m_sendParmChangeAlertsToEmail3;
bool m_sendParmChangeAlertsToEmail4;
float m_avgQueryTimeThreshold;
//float m_maxQueryTime;
@ -287,7 +287,7 @@ class Conf {
bool m_verifyDumpedLists;
// calls fsync(fd) if true after each write
bool m_flushWrites ;
bool m_flushWrites;
bool m_verifyWrites;
int32_t m_corruptRetries;
@ -325,9 +325,9 @@ class Conf {
bool m_doConsistencyTesting;
// defaults to "Gigabot/1.0"
char m_spiderUserAgent [ USERAGENTMAXSIZE ];
char m_spiderUserAgent[USERAGENTMAXSIZE];
char m_spiderBotName [ USERAGENTMAXSIZE ];
char m_spiderBotName[USERAGENTMAXSIZE];
int32_t m_autoSaveFrequency;
@ -362,48 +362,48 @@ class Conf {
// doc quota limits, url truncation limits
bool m_logLimits;
// log debug switches
bool m_logDebugAddurl ;
bool m_logDebugAdmin ;
bool m_logDebugBuild ;
bool m_logDebugBuildTime ;
bool m_logDebugDb ;
bool m_logDebugDirty ;
bool m_logDebugDisk ;
bool m_logDebugAddurl;
bool m_logDebugAdmin;
bool m_logDebugBuild;
bool m_logDebugBuildTime;
bool m_logDebugDb;
bool m_logDebugDirty;
bool m_logDebugDisk;
bool m_logDebugDiskPageCache;
bool m_logDebugDns ;
bool m_logDebugDns;
bool m_logDebugDownloads;
bool m_logDebugHttp ;
bool m_logDebugImage ;
bool m_logDebugLoop ;
bool m_logDebugLang ;
bool m_logDebugLinkInfo ;
bool m_logDebugMem ;
bool m_logDebugHttp;
bool m_logDebugImage;
bool m_logDebugLoop;
bool m_logDebugLang;
bool m_logDebugLinkInfo;
bool m_logDebugMem;
bool m_logDebugMemUsage;
bool m_logDebugMerge ;
bool m_logDebugNet ;
bool m_logDebugProxies ;
bool m_logDebugQuery ;
bool m_logDebugQuota ;
bool m_logDebugMerge;
bool m_logDebugNet;
bool m_logDebugProxies;
bool m_logDebugQuery;
bool m_logDebugQuota;
bool m_logDebugRobots ;
bool m_logDebugSpcache ; // SpiderCache.cpp debug
bool m_logDebugSpeller ;
bool m_logDebugTagdb ;
bool m_logDebugSpcache; // SpiderCache.cpp debug
bool m_logDebugSpeller;
bool m_logDebugTagdb;
bool m_logDebugSections;
bool m_logDebugSEO;
bool m_logDebugStats ;
bool m_logDebugSummary ;
bool m_logDebugSpider ;
bool m_logDebugMsg13 ;
bool m_logDebugUrlAttempts ;
bool m_logDebugTcp ;
bool m_logDebugTcpBuf ;
bool m_logDebugThread ;
bool m_logDebugTitle ;
bool m_logDebugTopDocs ;
bool m_logDebugUdp ;
bool m_logDebugUnicode ;
bool m_logDebugRepair ;
bool m_logDebugDate ;
bool m_logDebugStats;
bool m_logDebugSummary;
bool m_logDebugSpider;
bool m_logDebugMsg13;
bool m_logDebugUrlAttempts;
bool m_logDebugTcp;
bool m_logDebugTcpBuf;
bool m_logDebugThread;
bool m_logDebugTitle;
bool m_logDebugTopDocs;
bool m_logDebugUdp;
bool m_logDebugUnicode;
bool m_logDebugRepair;
bool m_logDebugDate;
bool m_logDebugDetailed;
bool m_logTraceBigFile;
@ -428,8 +428,8 @@ class Conf {
bool m_logTraceXmlDoc;
// expensive timing messages
bool m_logTimingAddurl ;
bool m_logTimingAdmin ;
bool m_logTimingAddurl;
bool m_logTimingAdmin;
bool m_logTimingBuild;
bool m_logTimingDb;
bool m_logTimingNet;
@ -451,14 +451,14 @@ class Conf {
bool m_generateVectorAtQueryTime;
char m_redirect[MAX_URL_LEN];
char m_useCompressionProxy;
char m_gzipDownloads;
bool m_useCompressionProxy;
bool m_gzipDownloads;
// used by proxy to make proxy point to the temp cluster while
// the original cluster is updated
char m_useTmpCluster;
bool m_useTmpCluster;
char m_timeSyncProxy;
bool m_timeSyncProxy;
Xml m_xml;
@ -474,27 +474,27 @@ class Conf {
// will not come back online. Messages will timeout on the dead
// host, but not error, allowing outstanding spidering to finish
// to the twin
char m_giveupOnDeadHosts;
bool m_giveupOnDeadHosts;
bool m_bypassValidation;
int32_t m_maxHeartbeatDelay;
int32_t m_maxCallbackDelay;
// used by Repair.cpp
bool m_repairingEnabled ;
int32_t m_maxRepairSpiders ;
bool m_repairingEnabled;
int32_t m_maxRepairSpiders;
int64_t m_repairMem;
SafeBuf m_collsToRepair;
char m_fullRebuild ;
char m_rebuildAddOutlinks;
char m_rebuildRecycleLinkInfo ;
char m_rebuildTitledb ;
char m_rebuildPosdb ;
char m_rebuildClusterdb ;
char m_rebuildSpiderdb ;
char m_rebuildLinkdb ;
char m_rebuildRoots ;
char m_rebuildNonRoots ;
bool m_fullRebuild;
bool m_rebuildAddOutlinks;
bool m_rebuildRecycleLinkInfo;
bool m_rebuildTitledb;
bool m_rebuildPosdb;
bool m_rebuildClusterdb;
bool m_rebuildSpiderdb;
bool m_rebuildLinkdb;
bool m_rebuildRoots;
bool m_rebuildNonRoots;
};
extern class Conf g_conf;

@ -1934,7 +1934,7 @@ int main2 ( int argc , char *argv[] ) {
}
// force give up on dead hosts to false
g_conf.m_giveupOnDeadHosts = 0;
g_conf.m_giveupOnDeadHosts = false;
// shout out if we're in read only mode
if ( g_conf.m_readOnlyMode )