[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db DBConnection.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db
In directory jcorp2.servlets.net:/tmp/cvs-serv10707/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db

Modified Files:
	DBConnection.java 
Log Message:
improve sql log output


Index: DBConnection.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBConnection.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** DBConnection.java	16 Jun 2004 08:52:27 -0000	1.45
--- DBConnection.java	17 Jun 2004 19:38:33 -0000	1.46
***************
*** 69,74 ****
  import com.jcorporate.expresso.core.db.datasource.DSException;
  import com.jcorporate.expresso.core.db.datasource.JndiDataSource;
- import com.jcorporate.expresso.core.misc.StringUtil;
  import com.jcorporate.expresso.core.dbobj.DBField;
  import com.jcorporate.expresso.kernel.util.ClassLocator;
  import org.apache.log4j.Logger;
--- 69,74 ----
  import com.jcorporate.expresso.core.db.datasource.DSException;
  import com.jcorporate.expresso.core.db.datasource.JndiDataSource;
  import com.jcorporate.expresso.core.dbobj.DBField;
+ import com.jcorporate.expresso.core.misc.StringUtil;
  import com.jcorporate.expresso.kernel.util.ClassLocator;
  import org.apache.log4j.Logger;
***************
*** 814,818 ****
      public synchronized void execute()
              throws DBException {
-         long beginTimer = 0;
          touch();
  
--- 814,817 ----
***************
*** 847,853 ****
                  myResultSet = null;
              }
-             if (log.isDebugEnabled()) {
-                 beginTimer = System.currentTimeMillis();
-             }
  
              if (stmnt != null) {
--- 846,849 ----
***************
*** 891,902 ****
              }
  
              if (log.isDebugEnabled()) {
!                 long endTimer = System.currentTimeMillis();
!                 log.debug("Time to execute '" + strSQL + "' was " +
!                         (endTimer - beginTimer) +
!                         " milliseconds");
!                 sqlLog.debug("Time to execute prepared statement was " +
!                         (endTimer - beginTimer) +
!                         " milliseconds");
              }
          } catch (SQLException se) {
--- 887,906 ----
              }
  
+             long endTimer = System.currentTimeMillis();
              if (log.isDebugEnabled()) {
!                 String pre = strSQL;
!                 if (preparedStatement != null) pre = " prepared statement";
!                 String msg = "Time to execute" + pre + " was " +
!                         (endTimer - getLastTouched()) +
!                         " milliseconds";
!                 log.debug(msg);
!             }
!             if (sqlLog.isDebugEnabled()) {
!                 String pre = "";
!                 if (preparedStatement != null) pre = " prepared statement";
!                 String msg = "Time to execute" + pre + " was " +
!                         (endTimer - getLastTouched()) +
!                         " milliseconds";
!                 sqlLog.debug(msg);
              }
          } catch (SQLException se) {
***************
*** 938,942 ****
      public synchronized void executeUpdate(String theSQL)
              throws DBException {
-         long beginTimer = 0;
          touch();
  
--- 942,945 ----
***************
*** 976,982 ****
                  stmnt = null;
              }
-             if (log.isDebugEnabled()) {
-                 beginTimer = System.currentTimeMillis();
-             }
  
              if (preparedStatement == null && strSQL != null && strSQL.length() > 0) {
--- 979,982 ----
***************
*** 996,1000 ****
              } else {
                  if (sqlLog.isDebugEnabled()) {
!                     sqlLog.debug("Executing update (prepared):" + strSQL);
                  }
                  lastUpdateCount = preparedStatement.executeUpdate();
--- 996,1000 ----
              } else {
                  if (sqlLog.isDebugEnabled()) {
!                     sqlLog.debug("Executing update (prepared):");
                  }
                  lastUpdateCount = preparedStatement.executeUpdate();
***************
*** 1004,1013 ****
              if (log.isDebugEnabled()) {
                  log.debug("Update '" + strSQL + "' took " +
!                         (endTimer - beginTimer) +
                          " milliseconds");
              }
              if (sqlLog.isDebugEnabled()) {
                  sqlLog.debug("Updated:" + lastUpdateCount + " records in " +
!                         (endTimer - beginTimer) + " milliseconds");
              }
          } catch (SQLException se) {
--- 1004,1014 ----
              if (log.isDebugEnabled()) {
                  log.debug("Update '" + strSQL + "' took " +
!                         (endTimer - getLastTouched()) +
                          " milliseconds");
              }
              if (sqlLog.isDebugEnabled()) {
                  sqlLog.debug("Updated:" + lastUpdateCount + " records in " +
!                         (endTimer - getLastTouched()) +
!                         " milliseconds");
              }
          } catch (SQLException se) {