parameter fix

master
Denes Matetelki 13 years ago
parent db3433c59f
commit af283fa823

@ -1,5 +1,4 @@
// g++ mysqlclient_main.cpp src/Logger.cpp src/MysqlClient.cpp src/ArgParse.cpp -I./include -lmysqlclient // gpp mysqlclient_tcpwrapper.cpp -o mysqltcpwrapper -I../include ../src/Logger.cpp ../src/Thread.cpp -lpthread ../src/Socket.cpp -std=c++0x ../src/WorkerThread.cpp MysqlTask.cpp EchoMessage.cpp ../src/ScopedLock.cpp ../src/ThreadPool.cpp ../src/ConditionVariable.cpp ../src/Mutex.cpp ../src/ArgParse.cpp ../src/MysqlConnectionPool.cpp -lmysqlclient -lrt ../src/MysqlClient.cpp -o mysqlclient
#include "Logger.hpp" #include "Logger.hpp"
#include "Common.hpp" #include "Common.hpp"
@ -37,18 +36,22 @@ void setUpArgs(ArgParse &argParse)
argParse.addArgument("--host", argParse.addArgument("--host",
"MySQL server hostname/IP", "MySQL server hostname/IP",
ArgParse::STRING, ArgParse::STRING,
ArgParse::REQUIRED ); ArgParse::REQUIRED,
ArgParse::REQUIRED);
argParse.addArgument("-u, --user", argParse.addArgument("-u, --user",
"MsSQL username", "MsSQL username",
ArgParse::STRING, ArgParse::STRING,
ArgParse::REQUIRED,
ArgParse::REQUIRED ); ArgParse::REQUIRED );
argParse.addArgument("-db, --database", argParse.addArgument("-db, --database",
"MySQL database", "MySQL database",
ArgParse::STRING, ArgParse::STRING,
ArgParse::REQUIRED,
ArgParse::REQUIRED ); ArgParse::REQUIRED );
argParse.addArgument("-p, --password", argParse.addArgument("-p, --password",
"MySQL password", "MySQL password",
ArgParse::STRING, ArgParse::STRING,
ArgParse::REQUIRED,
ArgParse::REQUIRED ); ArgParse::REQUIRED );
argParse.addArgument("-n, --number-of-connections", argParse.addArgument("-n, --number-of-connections",
"MySQL connections in connection pool. Default is 5", "MySQL connections in connection pool. Default is 5",
@ -116,6 +119,11 @@ bool checkArgs( int argc, char* argv[],
{ {
TRACE_STATIC; TRACE_STATIC;
if ( argc == 1 || ( argc == 2 && argv[1][0] != '-' ) ) {
std::cout << argParse.usage() << std::endl;
return false;
}
try { try {
getArgs( argc, argv, getArgs( argc, argv,
argParse, argParse,
@ -175,6 +183,8 @@ int main(int argc, char* argv[] )
conns, port, clients, pending, threads ) ) conns, port, clients, pending, threads ) )
return 1; return 1;
/*
// init MySQL connection pool // init MySQL connection pool
init_client_errs(); init_client_errs();
MysqlConnectionPool mysqlConnectionPool ( MysqlConnectionPool mysqlConnectionPool (
@ -218,6 +228,8 @@ int main(int argc, char* argv[] )
// end // end
mysqlConnectionPool.clear(); mysqlConnectionPool.clear();
finish_client_errs(); finish_client_errs();
*/
Logger::destroy(); Logger::destroy();
return 0; return 0;
} }

@ -278,7 +278,7 @@ ArgParse::printArgs(const Required argRequired) const
} }
} }
ret.append( std::string(30-length, ' ') ); ret.append( std::string( length < 30 ? 30-length : 2, ' ') );
ret.append( (*it).second.m_help ); ret.append( (*it).second.m_help );
ret.append("\n"); ret.append("\n");
} }

Loading…
Cancel
Save