summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin <jucovschi@gmail.com>2010-06-19 03:21:26 +0200
committerwww-data <www-data@ubuntu.localdomain>2010-06-19 03:25:16 +0200
commit0dfedf22781a2cec7801d4a7172d077812cf76b3 (patch)
treef78fdef61b7bfdeb51157ed787cf4efcb0100833
parent766755b13c913a69c1c0b7b8c1fb02748c1d7c38 (diff)
downloadrasdaman-upstream-0dfedf22781a2cec7801d4a7172d077812cf76b3.tar.gz
rasdaman-upstream-0dfedf22781a2cec7801d4a7172d077812cf76b3.tar.xz
rasdaman-upstream-0dfedf22781a2cec7801d4a7172d077812cf76b3.zip
fixed bug which made server crash in release mode because of default values not being set.
-rw-r--r--server/rasserver_config.cc4
-rw-r--r--server/rasserver_config.hh3
2 files changed, 1 insertions, 6 deletions
diff --git a/server/rasserver_config.cc b/server/rasserver_config.cc
index 518d878..04745a3 100644
--- a/server/rasserver_config.cc
+++ b/server/rasserver_config.cc
@@ -108,7 +108,6 @@ void Configuration::initParameters()
cmlConnectStr = &cmlInter.addStringParameter(NSN, "connect", "<connect-str> connect string for underlying database(e.g. test/test@julep)", "/");
cmlLog = &cmlInter.addStringParameter('l', "log", "<log-file> log is printed to <log-file>\n\t\tif <log-file> is stdout , log output is printed to standard out", "$RMANHOME/log/<srv-name>.<pid>.log");
-#ifdef RMANDEBUG
cmlTileSize = &cmlInter.addLongParameter(NSN, "tilesize", "<nnnn> specifies maximal size of tiles in bytes\n\t\t-regular tiles with equal edge lengthes", 2097152);
cmlPctMin = &cmlInter.addLongParameter(NSN, "pctmin", "<nnnn> specifies minimal size of blobtiles in bytes", 2048);
cmlPctMax = &cmlInter.addLongParameter(NSN, "pctmax", "<nnnn> specifies maximal size of inlinetiles in bytes", 4096);
@@ -135,7 +134,6 @@ void Configuration::initParameters()
cmlIndexSize = &cmlInter.addLongParameter(NSN, "indexsize", indexsizeDesc.c_str(),0L);
cmlDbg = &cmlInter.addStringParameter('d', "debug", "<dgb-file> debug output is printed to <dbg-file>; if <dbg-file> is stdout, debug output is printed to standard out","<srv-name>.log");
cmlDbgLevel = &cmlInter.addLongParameter(NSN, "dl", "<nn> debug level (0-4; 0 = no / 4 = maximal debug information)", 0L);
-#endif // RMANDEBUG
}
#undef NSN
@@ -165,7 +163,6 @@ void Configuration::checkParameters()
optLevel = cmlOptLevel->getValueAsLong();
dbConnection = cmlConnectStr->getValueAsString();
-#ifdef RMANDEBUG
tileSize = cmlTileSize->getValueAsLong();
pctMin = cmlPctMin->getValueAsLong();
pctMax = cmlPctMax->getValueAsLong();
@@ -178,7 +175,6 @@ void Configuration::checkParameters()
indexSize = cmlIndexSize->getValueAsLong();
deprecated(cmlDbg);
dbgLevel = cmlDbgLevel->getValueAsLong();
-#endif
LEAVE( "Configuration::checkParameters()" );
}
diff --git a/server/rasserver_config.hh b/server/rasserver_config.hh
index dc9a40e..8dc37ee 100644
--- a/server/rasserver_config.hh
+++ b/server/rasserver_config.hh
@@ -92,7 +92,6 @@ class Configuration
CommandLineParameter *cmlConnectStr;
CommandLineParameter *cmlLog;
-#ifdef RMANDEBUG
CommandLineParameter *cmlTileSize;
CommandLineParameter *cmlPctMin;
CommandLineParameter *cmlPctMax;
@@ -103,7 +102,7 @@ class Configuration
CommandLineParameter *cmlIndexSize;
CommandLineParameter *cmlDbg;
CommandLineParameter *cmlDbgLevel;
-#endif
+
const char* myExecutable;
const char* serverName;