From: <ibr...@us...> - 2009-09-08 21:21:21
|
Revision: 3288 http://tora.svn.sourceforge.net/tora/?rev=3288&view=rev Author: ibre5041 Date: 2009-09-08 21:21:14 +0000 (Tue, 08 Sep 2009) Log Message: ----------- logging added Modified Paths: -------------- branches/tora-trotl/src/toconnection.cpp branches/tora-trotl/src/toconnectionpool.cpp branches/tora-trotl/src/toeventquery.cpp branches/tora-trotl/src/tonoblockquery.cpp branches/tora-trotl/src/tooracleconnection.cpp Modified: branches/tora-trotl/src/toconnection.cpp =================================================================== --- branches/tora-trotl/src/toconnection.cpp 2009-09-08 09:29:49 UTC (rev 3287) +++ branches/tora-trotl/src/toconnection.cpp 2009-09-08 21:21:14 UTC (rev 3288) @@ -287,7 +287,7 @@ Connection->ConnectionPool->release(ConnectionSub); throw; } - get_log().ts( std::string(__HERE_SHORT__)) << "setQuery" << std::endl; + get_log().ts( std::string(__HERE__)) << "setQuery" << std::endl; ConnectionSub->setQuery(this); } @@ -363,7 +363,7 @@ Connection->ConnectionPool->release(ConnectionSub); throw; } - get_log().ts( std::string(__HERE_SHORT__)) << "setQuery" << std::endl; + get_log().ts( std::string(__HERE__)) << "setQuery" << std::endl; ConnectionSub->setQuery(this); } @@ -389,7 +389,7 @@ Connection->ConnectionPool->release(ConnectionSub); throw; } - get_log().ts( std::string(__HERE_SHORT__)) << "setQuery" << std::endl; + get_log().ts( std::string(__HERE__)) << "setQuery" << std::endl; ConnectionSub->setQuery(this); } @@ -418,7 +418,7 @@ Query = NULL; throw; } - get_log().ts( std::string(__HERE_SHORT__)) << "setQuery" << std::endl; + get_log().ts( std::string(__HERE__)) << "setQuery" << std::endl; ConnectionSub->setQuery(this); } @@ -444,7 +444,7 @@ Connection->ConnectionPool->release(ConnectionSub); throw; } - get_log().ts( std::string(__HERE_SHORT__)) << "setQuery" << std::endl; + get_log().ts( std::string(__HERE__)) << "setQuery" << std::endl; ConnectionSub->setQuery(this); } @@ -475,7 +475,7 @@ Connection->ConnectionPool->release(ConnectionSub); throw; } - get_log().ts( std::string(__HERE_SHORT__)) << "setQuery" << std::endl; + get_log().ts( std::string(__HERE__)) << "setQuery" << std::endl; ConnectionSub->setQuery(this); } @@ -506,7 +506,7 @@ Connection->ConnectionPool->release(ConnectionSub); throw; } - get_log().ts( std::string(__HERE_SHORT__)) << "setQuery" << std::endl; + get_log().ts( std::string(__HERE__)) << "setQuery" << std::endl; ConnectionSub->setQuery(this); } @@ -530,7 +530,7 @@ Query = NULL; throw; } - get_log().ts( std::string(__HERE_SHORT__)) << "setQuery" << std::endl; + get_log().ts( std::string(__HERE__)) << "setQuery" << std::endl; ConnectionSub->setQuery(this); } @@ -559,7 +559,7 @@ { if (ConnectionSub->query() == this) { - get_log().ts( std::string(__HERE_SHORT__)) << "setQuery" << std::endl; + get_log().ts( std::string(__HERE__)) << "setQuery" << std::endl; ConnectionSub->setQuery(NULL); } if (Mode != Test && Connection && Connection->ConnectionPool) @@ -677,7 +677,7 @@ toQValue toQuery::readValue(void) { - //get_log().ts( std::string(__HERE_SHORT__)) << this->sql().left(50).toUtf8().constData() << std::endl; + //get_log().ts( std::string(__HERE__)) << this->sql().left(50).toUtf8().constData() << std::endl; if (!Connection) return toQValue(0); @@ -690,7 +690,7 @@ toQValue toQuery::readValueNull(void) { //TODO - //get_log().ts( std::string(__HERE_SHORT__)) << this->sql().left(50).toUtf8().constData() << std::endl; + //get_log().ts( std::string(__HERE__)) << this->sql().left(50).toUtf8().constData() << std::endl; if (!Connection) return toQValue(0); Modified: branches/tora-trotl/src/toconnectionpool.cpp =================================================================== --- branches/tora-trotl/src/toconnectionpool.cpp 2009-09-08 09:29:49 UTC (rev 3287) +++ branches/tora-trotl/src/toconnectionpool.cpp 2009-09-08 21:21:14 UTC (rev 3288) @@ -82,17 +82,17 @@ void toConnectionPoolTest::test() { for(int i = 0; Pool && i < Pool->size(); i++) { - get_log().ts( std::string(__HERE_SHORT__)) << "Pool member id:" << i << std::endl; + get_log().ts( std::string(__HERE__)) << "Pool member id:" << i << std::endl; toConnectionPool::PooledState state = Pool->test(i); if(state == toConnectionPool::Busy) { - get_log().ts( std::string(__HERE_SHORT__)) << "Pool member id:" << i << " Busy" << std::endl; + get_log().ts( std::string(__HERE__)) << "Pool member id:" << i << " Busy" << std::endl; continue; } if(state == toConnectionPool::Broken) { - get_log().ts( std::string(__HERE_SHORT__)) << "Pool member id:" << i << " Broken" << std::endl; + get_log().ts( std::string(__HERE__)) << "Pool member id:" << i << " Broken" << std::endl; Pool->fix(i); } } @@ -250,10 +250,10 @@ PooledSub *psub = (*ptr)[member]; if(psub->State != Free) { - get_log().ts( std::string(__HERE_SHORT__)) << "Pool member:" << member << " is NOT free" << std::endl; + get_log().ts( std::string(__HERE__)) << "Pool member:" << member << " is NOT free" << std::endl; return psub->State; } - get_log().ts( std::string(__HERE_SHORT__)) << "Pool member" << member << " is free" << std::endl; + get_log().ts( std::string(__HERE__)) << "Pool member" << member << " is free" << std::endl; psub->State = Busy; ptr.unlock(); @@ -270,7 +270,7 @@ PooledState state = Free; try { QString sql = toSQL::string("Global:Now", *Connection); - //get_log().ts( std::string(__HERE_SHORT__)) << sql.toUtf8().constData() << std::endl; + //get_log().ts( std::string(__HERE__)) << sql.toUtf8().constData() << std::endl; if(sql.isEmpty()) return state; Modified: branches/tora-trotl/src/toeventquery.cpp =================================================================== --- branches/tora-trotl/src/toeventquery.cpp 2009-09-08 09:29:49 UTC (rev 3287) +++ branches/tora-trotl/src/toeventquery.cpp 2009-09-08 21:21:14 UTC (rev 3288) @@ -55,7 +55,7 @@ toQValue toEventQuery::readValueNull() { - get_log().ts( std::string(__HERE_SHORT__)) << std::endl; + get_log().ts( std::string(__HERE__)) << std::endl; if(Values.isEmpty()) throw tr("Read past end of query"); Modified: branches/tora-trotl/src/tonoblockquery.cpp =================================================================== --- branches/tora-trotl/src/tonoblockquery.cpp 2009-09-08 09:29:49 UTC (rev 3287) +++ branches/tora-trotl/src/tonoblockquery.cpp 2009-09-08 21:21:14 UTC (rev 3288) @@ -1,8 +1,10 @@ #include <iomanip> #include <iostream> #include <string> +#include <sstream> #include "tora_logger.h" +#include "ts_log/ts_log_utils.h" /* BEGIN_COMMON_COPYRIGHT_HEADER * @@ -94,7 +96,7 @@ toLocker lock (Parent.Lock) ; Parent.ReadingValues.insert(Parent.ReadingValues.end(), value); - get_log().ts( std::string(__HERE_SHORT__)) + get_log().ts( std::string(__HERE__)) << "Value read:" << value.toString().toUtf8().constData() << std::endl; @@ -137,21 +139,21 @@ } catch (const toConnection::exception &str) { - //std::cerr << "Unhandled exception: " << __HERE__ << std::endl; + //get_log().ts( std::string(__HERE__)) << "Unhandled exception: " << __HERE__ << std::endl; toLocker lock (Parent.Lock) ; Parent.Error = str; } catch (const QString &str) { - //std::cerr << "Unhandled exception: " << __HERE__ << std::endl; + //get_log().ts( std::string(__HERE__)) << "Unhandled exception: " << __HERE__ << std::endl; toLocker lock (Parent.Lock) ; Parent.Error = str; } catch (...) { - //std::cerr << "Unhandled exception: " << __HERE__ << std::endl; + //get_log().ts( std::string(__HERE__)) << "Unhandled exception: " << __HERE__ << std::endl; toLocker lock (Parent.Lock) ; Parent.Error = qApp->translate("toNoBlockQuery", "Unknown exception"); @@ -166,7 +168,8 @@ } catch (...) { - std::cerr << "Unhandled exception: " << __HERE__ << std::endl; +// get_log().ts( std::string(__HERE__)) +// << "Unhandled exception: " << __HERE__ << std::endl; } delete Parent.Query; Parent.Query = NULL; @@ -176,7 +179,7 @@ toQValue toNoBlockQuery::readValueNull() { - //get_log().ts( std::string(__HERE_SHORT__)) << std::endl; + //get_log().ts( std::string(__HERE__)) << std::endl; if (CurrentValue == Values.end()) { @@ -190,7 +193,7 @@ Values = ReadingValues; CurrentValue = Values.begin(); ReadingValues.clear(); - get_log().ts( std::string(__HERE_SHORT__)) + get_log().ts( std::string(__HERE__)) << "Value read:" << (*CurrentValue).toString().toUtf8().constData() << std::endl; @@ -240,7 +243,8 @@ } catch (...) { - std::cerr << "Unhandled exception: " << __HERE__ << std::endl; +// get_log().ts( std::string(__HERE__)) +// << "Unhandled exception: " << __HERE__ << std::endl; Statistics = NULL; } @@ -259,7 +263,8 @@ } catch (...) { - std::cerr << "Unhandled exception: " << __HERE__ << std::endl; +// get_log().ts( std::string(__HERE__)) +// << "Unhandled exception: " << __HERE__ << std::endl; Error = qApp->translate("toNoBlockQuery", "Failed to start background query thread"); while (Running.getValue()) Running.down(); @@ -300,7 +305,8 @@ } catch (...) { - std::cerr << "Unhandled exception: " << __HERE__ << std::endl; +// get_log().ts( std::string(__HERE__)) +// << "Unhandled exception: " << __HERE__ << std::endl; Statistics = NULL; } @@ -319,7 +325,7 @@ } catch (...) { - std::cerr << "Unhandled exception: " << __HERE__ << std::endl; + // get_log().ts( std::string(__HERE__)) << "Unhandled exception: " << __HERE__ << std::endl; Error = qApp->translate("toNoBlockQuery", "Failed to start background query thread"); while (Running.getValue()) Running.down(); @@ -448,7 +454,7 @@ } catch (...) { - std::cerr << "Unhandled exception: " << __HERE__ << std::endl; + //get_log().ts( std::string(__HERE__)) << "Unhandled exception: " << __HERE__ << std::endl; Statistics = NULL; } @@ -457,7 +463,7 @@ } catch (...) { - std::cerr << "Unhandled exception: " << __HERE__ << std::endl; + //get_log().ts( std::string(__HERE__)) << "Unhandled exception: " << __HERE__ << std::endl; Error = qApp->translate("toNoBlockQuery", "Failed to start background query thread"); while (Running.getValue()) Running.down(); Modified: branches/tora-trotl/src/tooracleconnection.cpp =================================================================== --- branches/tora-trotl/src/tooracleconnection.cpp 2009-09-08 09:29:49 UTC (rev 3287) +++ branches/tora-trotl/src/tooracleconnection.cpp 2009-09-08 21:21:14 UTC (rev 3288) @@ -110,7 +110,7 @@ static void ThrowException(const ::trotl::OciException &exc) { - get_log().ts( std::string(__HERE_SHORT__)) + get_log().ts( std::string(__HERE__)) << "What:" << exc.what() << std::endl << exc.get_sql() << std::endl << "--------------------------------------------------------------------------------" @@ -191,7 +191,7 @@ virtual void throwExtendedException(toConnection &conn, const ::trotl::OciException &exc) { - get_log().ts( std::string(__HERE_SHORT__)) + get_log().ts( std::string(__HERE__)) << "What:" << exc.what() << std::endl << exc.get_sql() << std::endl << "--------------------------------------------------------------------------------" @@ -240,7 +240,7 @@ oracleQuery(toQuery *query, oracleSub *) : toQuery::queryImpl(query) { - get_log().ts( std::string(__HERE_SHORT__)) << std::endl; + get_log().ts( std::string(__HERE__)) << std::endl; Running = Cancel = false; SaveInPool = false; Query = NULL; @@ -261,27 +261,39 @@ const ::trotl::BindPar& bp( Query->_stmt_type == OCI_STMT_SELECT ? Query->get_curr_column() : Query->get_curr_out_bindpar()); - switch(bp.dty) { - case SQLT_NUM: - case SQLT_VNU: - { - int i; - (*Query) >> i; - get_log().ts( std::string(__HERE_SHORT__)) << - "d:\t" << bp.dty << - "\ti:\t'" << i << '\'' << std::endl; - return toQValue(i); + try { + switch(bp.dty) { + case SQLT_NUM: + case SQLT_VNU: + { + int i; + (*Query) >> i; + get_log().ts( std::string(__HERE__)) << + "d:\t" << bp.dty << + "\ti:\t'" << i << '\'' << std::endl; + return toQValue(i); + } + default: + { + std::string val; + (*Query) >> val; + get_log().ts( std::string(__HERE__)) << + "d:\t" << bp.dty << + "\ts:\t'" << val << '\'' << std::endl; + return toQValue(val.c_str()); + } + } + } catch (::trotl::OciException e) { + get_log().ts( std::string(__HERE__)) << + e.what() << std::endl; + return QString(); + } catch (...) { + get_log().ts( std::string(__HERE__)) << + "Unknown exception" << std::endl; + return QString(); } - default: - { - std::string val; - (*Query) >> val; - get_log().ts( std::string(__HERE_SHORT__)) << - "d:\t" << bp.dty << - "\ts:\t'" << val << '\'' << std::endl; - return toQValue(val.c_str()); - } - } + + /* char *buffer = NULL; otl_var_desc *dsc = Query->describe_next_out_var(); @@ -448,17 +460,17 @@ virtual bool eof(void) { if (!Query || Cancel) { - get_log().ts( std::string(__HERE_SHORT__)) << "eof - (1) true" << std::endl; + get_log().ts( std::string(__HERE__)) << "eof - (1) true" << std::endl; return true; } try { bool e = Query->eof(); - get_log().ts( std::string(__HERE_SHORT__)) << "eof - (2) " << e << std::endl; + get_log().ts( std::string(__HERE__)) << "eof - (2) " << e << std::endl; return e; //Query->eof(); } catch (const ::trotl::OciException &exc) { - get_log().ts( std::string(__HERE_SHORT__)) << "eof - (e) true" << std::endl; + get_log().ts( std::string(__HERE__)) << "eof - (e) true" << std::endl; if(query()) { oracleSub *conn = dynamic_cast<oracleSub *>(query()->connectionSub()); @@ -471,13 +483,13 @@ virtual int rowsProcessed(void) { - get_log().ts( std::string(__HERE_SHORT__)) << "TODO: rowsProcessed A:" << std::endl; + get_log().ts( std::string(__HERE__)) << "TODO: rowsProcessed A:" << std::endl; if (!Query) return 0; //return Query->get_last_row(); ???? unsigned i = Query->get_last_row(); - get_log().ts( std::string(__HERE_SHORT__)) << "TODO: rowsProcessed B: " << i << std::endl; + get_log().ts( std::string(__HERE__)) << "TODO: rowsProcessed B: " << i << std::endl; return i; } @@ -485,27 +497,27 @@ { //int descriptionLen; //Query->describe_select(descriptionLen); - get_log().ts( std::string(__HERE_SHORT__)) << "TODO: columns:" << std::endl; + get_log().ts( std::string(__HERE__)) << "TODO: columns:" << std::endl; return Query->get_column_count(); } virtual std::list<toQuery::queryDescribe> describe(void) { - get_log().ts( std::string(__HERE_SHORT__)) << std::endl; + get_log().ts( std::string(__HERE__)) << std::endl; std::list<toQuery::queryDescribe> ret; int datatypearg1 = 0; int datatypearg2 = 0; - get_log().ts( std::string(__HERE_SHORT__)) << "TODO describe:" << std::endl; + get_log().ts( std::string(__HERE__)) << "TODO describe:" << std::endl; // TODO trotl should return const iterator const std::vector<trotl::ColumnType> &col = Query->get_columns(); std::vector<trotl::ColumnType>::const_iterator it = col.begin(); ++it; // starts with 1st - //get_log().ts( std::string(__HERE_SHORT__)) << "Columns: " << q1.get_column_count() << std::endl; + //get_log().ts( std::string(__HERE__)) << "Columns: " << q1.get_column_count() << std::endl; for(; it != col.end(); ++it) { - get_log().ts( std::string(__HERE_SHORT__)) << "Var: " << (*it).get_type_str(true) << std::endl; + get_log().ts( std::string(__HERE__)) << "Var: " << (*it).get_type_str(true) << std::endl; toQuery::queryDescribe desc; desc.AlignRight = false; desc.Name = QString::fromUtf8( (*it)._column_name.c_str() ); @@ -720,7 +732,7 @@ cur.Comment = objects.readValueNull(); ret.insert(ret.end(), cur); } - get_log().ts( std::string(__HERE_SHORT__)) + get_log().ts( std::string(__HERE__)) << "++++ objectNames +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" << std::endl; @@ -752,7 +764,7 @@ (*i).Synonyms.insert((*i).Synonyms.end(), synonym); } } - get_log().ts( std::string(__HERE_SHORT__)) + get_log().ts( std::string(__HERE__)) << "++++ synonymMap ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" << std::endl; @@ -921,7 +933,7 @@ return QString(version.str().c_str()); } catch (::trotl::OciException e) { - get_log().ts( std::string(__HERE_SHORT__)) << e.what() << std::endl; + get_log().ts( std::string(__HERE__)) << e.what() << std::endl; exit(0); } catch (...) @@ -940,14 +952,14 @@ virtual void execute(toConnectionSub *sub, const QString &sql, toQList ¶ms) { oracleSub *conn = oracleConv(sub); - get_log().ts( std::string(__HERE_SHORT__)) << std::endl; + get_log().ts( std::string(__HERE__)) << std::endl; if ( params.empty() ) { try { //otl_cursor::direct_exec(*(conn->Connection), sql.toUtf8().constData()); //TODO - //get_log().ts( std::string(__HERE_SHORT__)) << "TODO: otl_cursor::direct_exec" << __HERE_SHORT__ << std::endl; + //get_log().ts( std::string(__HERE__)) << "TODO: otl_cursor::direct_exec" << __HERE__ << std::endl; } catch (const ::trotl::OciException &exc) { @@ -990,7 +1002,7 @@ _envp = new ::trotl::OciEnv(*_envallocp); - //get_log().ts( std::string(__HERE_SHORT__)) << "TODO: initialize" << std::endl << __HERE_SHORT__ << std::endl; + //get_log().ts( std::string(__HERE__)) << "TODO: initialize" << std::endl << __HERE__ << std::endl; addProvider("Oracle"); } @@ -1070,6 +1082,7 @@ str = buffer; } } + str.append(QString::fromLatin1("/tnsnames.ora")); #else if (getenv("TNS_ADMIN")) { @@ -1151,7 +1164,7 @@ void toOracleProvider::oracleQuery::execute(void) { - get_log().ts( std::string(__HERE_SHORT__)) << std::endl; + get_log().ts( std::string(__HERE__)) << std::endl; oracleSub *conn = dynamic_cast<oracleSub *>(query()->connectionSub()); if (!conn) @@ -1169,7 +1182,7 @@ QString sql = this->query()->sql(); sql.replace(stripnl, ""); - get_log().ts( std::string(__HERE_SHORT__)) << "SQL:" << ::std::string(sql.toUtf8().constData()) << std::endl; + get_log().ts( std::string(__HERE__)) << "SQL:" << ::std::string(sql.toUtf8().constData()) << std::endl; //Query = new oracleQuery::oracleSqlStatement(*conn->_conn, sql.toUtf8().constData()); Query = new ::trotl::SqlStatement(*conn->_conn, ::std::string(sql.toUtf8().constData())); @@ -1202,19 +1215,19 @@ if( bp.bind_typename == "int" /*&& (*i).isInt()*/ ) { (*Query) << (*i).toInt(); - get_log().ts( std::string(__HERE_SHORT__)) + get_log().ts( std::string(__HERE__)) << "VERY VERY TODO: bind param(i):'" << bp.bind_name << "'\t" << (*i).toInt() << " of:" << query()->params().size() << std::endl; } else if( bp.bind_typename == "char" && (*i).isString()) { std::string param((const char*)((*i).toString().toUtf8().constData())); - get_log().ts( std::string(__HERE_SHORT__)) + get_log().ts( std::string(__HERE__)) << "VERY VERY TODO: bind param(s):'" << bp.bind_name << "'\t" << param << " of:" << query()->params().size() << std::endl; (*Query) << ::std::string((const char*)((*i).toString().toUtf8().constData())); - get_log().ts( std::string(__HERE_SHORT__)) + get_log().ts( std::string(__HERE__)) << "VERY VERY TODO: bind param:" << ::std::string((const char*)((*i).toString().toUtf8().constData())) << std::endl; } else { @@ -1364,7 +1377,7 @@ (ub4) session_mode); conn = new ::trotl::OciConnection(_env, *login); - ::get_log().ts( std::string(__HERE_SHORT__)) << "Oracle database version: " + ::get_log().ts( std::string(__HERE__)) << "Oracle database version: " << ::std::hex << ::std::showbase << ::std::setw(10) << ::std::setfill('0') << ::std::internal << login->_server._version << ::std::endl @@ -1379,8 +1392,8 @@ } catch (const ::trotl::OciException &exc) { - get_log().ts( std::string(__HERE_SHORT__)) - << "TODO: catch" << std::endl << __HERE_SHORT__ << std::endl; + get_log().ts( std::string(__HERE__)) + << "TODO: catch" << std::endl << __HERE__ << std::endl; if (toThread::mainThread() && exc.get_code() == 28001) { bool ok = false; @@ -1421,7 +1434,7 @@ connection().setPassword(newpass); } else { - get_log().ts( std::string(__HERE_SHORT__)) << std::endl; + get_log().ts( std::string(__HERE__)) << std::endl; throw exc; } // (toThread::mainThread() && exc.get_code() == 28001) } // catch (const ::trotl::OciException &exc) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |