Skip to content
Snippets Groups Projects
Commit 3bb96c8f authored by gmantele's avatar gmantele
Browse files

[TAP] Come back on the v1.0 definition of TAPLog and fix a bug (missing DB...

[TAP] Come back on the v1.0 definition of TAPLog and fix a bug (missing DB table name in logs for CREATE, INSERT, DROP TABLE ; name missing in getFullDBName(TAPTable))
parent 53498b2e
No related branches found
No related tags found
No related merge requests found
......@@ -34,7 +34,7 @@ import uws.service.log.DefaultUWSLog;
* Default implementation of the {@link TAPLog} interface which lets logging any message about a TAP service.
*
* @author Grégory Mantelet (CDS;ARI)
* @version 2.0 (07/2014)
* @version 2.0 (08/2014)
*
* @see DefaultUWSLog
*/
......@@ -94,13 +94,58 @@ public class DefaultTAPLog extends DefaultUWSLog implements TAPLog {
dbActivity("TAP metadata loaded into the database !");
}
@Override
public void connectionOpened(DBConnection connection, String dbName){
dbActivity("A connection has been opened to the database \"" + dbName + "\" !");
}
@Override
public void connectionClosed(DBConnection connection){
//dbActivity("A database connection has been closed !");
dbActivity("A database connection has been closed !");
}
@Override
public void transactionStarted(final DBConnection connection){
dbActivity("A transaction has been started !");
}
@Override
public void transactionCancelled(final DBConnection connection){
dbActivity("A transaction has been cancelled !");
}
@Override
public void transactionEnded(final DBConnection connection){
dbActivity("A transaction has been ended/commited !");
}
@Override
public void schemaCreated(final DBConnection connection, String schema){
dbActivity("CREATE SCHEMA \"" + schema + "\"\t" + connection.getID());
}
@Override
public void schemaDropped(final DBConnection connection, String schema){
dbActivity("DROP SCHEMA \"" + schema + "\"\t" + connection.getID());
}
protected final String getFullDBName(final TAPTable table){
return (table.getSchema() != null) ? (table.getSchema().getDBName() + ".") : "";
return ((table.getSchema() != null) ? (table.getSchema().getDBName() + ".") : "") + table.getDBName();
}
@Override
public void tableCreated(final DBConnection connection, TAPTable table){
dbActivity("CREATE TABLE \"" + getFullDBName(table) + "\" (ADQL name: \"" + table.getFullName() + "\")\t" + connection.getID());
}
@Override
public void tableDropped(final DBConnection connection, TAPTable table){
dbActivity("DROP TABLE \"" + getFullDBName(table) + "\" (ADQL name: \"" + table.getFullName() + "\")\t" + connection.getID());
}
@Override
public void rowsInserted(final DBConnection connection, TAPTable table, int nbInsertedRows){
dbActivity("INSERT ROWS (" + ((nbInsertedRows > 0) ? nbInsertedRows : "???") + ") into \"" + getFullDBName(table) + "\" (ADQL name: \"" + table.getFullName() + "\")\t" + connection.getID());
}
@Override
......
......@@ -23,13 +23,14 @@ package tap.log;
import tap.TAPExecutionReport;
import tap.db.DBConnection;
import tap.metadata.TAPMetadata;
import tap.metadata.TAPTable;
import uws.service.log.UWSLog;
/**
* Lets logging any kind of message about a TAP service.
*
* @author Grégory Mantelet (CDS;ARI)
* @version 2.0 (07/2014)
* @version 2.0 (08/2014)
*/
public interface TAPLog extends UWSLog {
......@@ -43,10 +44,26 @@ public interface TAPLog extends UWSLog {
public void tapMetadataLoaded(final TAPMetadata metadata);
public void connectionOpened(final DBConnection connection);
public void connectionOpened(final DBConnection connection, final String dbName);
public void connectionClosed(final DBConnection connection);
public void transactionStarted(final DBConnection connection);
public void transactionCancelled(final DBConnection connection);
public void transactionEnded(final DBConnection connection);
public void schemaCreated(final DBConnection connection, final String schema);
public void schemaDropped(final DBConnection connection, final String schema);
public void tableCreated(final DBConnection connection, final TAPTable table);
public void tableDropped(final DBConnection connection, final TAPTable table);
public void rowsInserted(final DBConnection connection, final TAPTable table, final int nbInsertedRows);
public void sqlQueryExecuting(final DBConnection connection, final String sql);
public void sqlQueryError(final DBConnection connection, final String sql, final Throwable t);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment