Redis/redis-For-Windows
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Restored support for the command argument --test-memory

Browse Source 
along with -h, --help, -v, --version
This commit is contained in:
Enrico Giordani
2015-06-09 17:21:56 +02:00
parent 64c14409d9
commit 2975545e6a
2 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Win32_Interop/Win32_CommandLine.cpp
+47 -33
View File
@@ -595,41 +595,53 @@ void ParseCommandLineArguments(int argc, char** argv) {
string argument = string(argv[n]).substr(2, argument.length() - 2);
transform(argument.begin(), argument.end(), argument.begin(), ::tolower);
if (g_redisArgMap.find(argument) == g_redisArgMap.end()) {
stringstream err;
err << "unknown argument: " << argument;
throw invalid_argument(err.str());
}
vector<string> params;
if (argument == cSentinel) {
try {
vector<string> sentinelSubCommands = g_redisArgMap[argument]->Extract(n, argc, argv);
for (auto p : sentinelSubCommands) {
params.push_back(p);
}
} catch (invalid_argument iaerr) {
// if no subcommands could be mapped, then assume this is the parameterless --sentinel command line only argument
}
} else if (argument == cServiceRun ) {
// When the service starts the current directory is %systemdir%. This needs to be changed to the
// directory the executable is in so that the .conf file can be loaded.
char szFilePath[MAX_PATH];
if (GetModuleFileNameA(NULL, szFilePath, MAX_PATH) == 0) {
throw std::system_error(GetLastError(), system_category(), "ParseCommandLineArguments: GetModuleFileName failed");
}
string currentDir = szFilePath;
auto pos = currentDir.rfind("\\");
currentDir.erase(pos);
if (FALSE == SetCurrentDirectoryA(currentDir.c_str())) {
throw std::system_error(GetLastError(), system_category(), "SetCurrentDirectory failed");
// Some -- arguments are passed directly to redis.c::main()
if (find(cRedisArgsForMainC.begin(), cRedisArgsForMainC.end(), argument) != cRedisArgsForMainC.end()) {
if (strcasecmp(argument.c_str(), "test-memory") == 0) {
// The test-memory argument is followed by a integer value
n++;
}
} else {
params = g_redisArgMap[argument]->Extract(n, argc, argv);
// -- arguments processed before calling redis.c::main()
if (g_redisArgMap.find(argument) == g_redisArgMap.end()) {
stringstream err;
err << "unknown argument: " << argument;
throw invalid_argument(err.str());
}
vector<string> params;
if (argument == cSentinel) {
try {
vector<string> sentinelSubCommands = g_redisArgMap[argument]->Extract(n, argc, argv);
for (auto p : sentinelSubCommands) {
params.push_back(p);
}
}
catch (invalid_argument iaerr) {
// if no subcommands could be mapped, then assume this is the parameterless --sentinel command line only argument
}
} else if (argument == cServiceRun) {
// When the service starts the current directory is %systemdir%. This needs to be changed to the
// directory the executable is in so that the .conf file can be loaded.
char szFilePath[MAX_PATH];
if (GetModuleFileNameA(NULL, szFilePath, MAX_PATH) == 0) {
throw std::system_error(GetLastError(), system_category(), "ParseCommandLineArguments: GetModuleFileName failed");
}
string currentDir = szFilePath;
auto pos = currentDir.rfind("\\");
currentDir.erase(pos);
if (FALSE == SetCurrentDirectoryA(currentDir.c_str())) {
throw std::system_error(GetLastError(), system_category(), "SetCurrentDirectory failed");
}
} else {
params = g_redisArgMap[argument]->Extract(n, argc, argv);
}
g_argMap[argument].push_back(params);
n += (int) params.size();
}
g_argMap[argument].push_back(params);
n += (int)params.size();
} else if (string(argv[n]).substr(0, 1) == "-") {
// Do nothing, the - arguments are passed to redis.c::main() as they are
} else {
confFile = true;
confFilePath = argv[n];
@@ -641,7 +653,9 @@ void ParseCommandLineArguments(int argc, char** argv) {
throw std::system_error(GetLastError(), system_category(), "ParseCommandLineArguments: GetCurrentDirectoryA failed");
}
if (confFile) ParseConfFile(confFilePath, cwd, g_argMap);
if (confFile) {
ParseConfFile(confFilePath, cwd, g_argMap);
}
// grab directory where RDB/AOF/DAT files will be created so that service install can add access allowed ACE to path
string fileCreationDirectory = ".\\";
src/Win32_Interop/Win32_CommandLine.h
+3
View File
@@ -64,3 +64,6 @@ const string cNo = "no";
const string cDefaultSyslogIdent = "redis";
const string cDefaultLogfile = "stdout";
/* List of -- command arguments to be passed to redis::main() unaltered */
const vector<string> cRedisArgsForMainC = {"help", "version", "test-memory"};