Author: [log in to unmask]
Date: Sun Feb 15 00:02:22 2015
New Revision: 2153
Log:
Add logging of conditions set creation and increase default log level.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/database/ConditionsObjectConverter.java
java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/ConditionsObjectConverter.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/ConditionsObjectConverter.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/ConditionsObjectConverter.java Sun Feb 15 00:02:22 2015
@@ -114,6 +114,8 @@
} catch (ConditionsObjectException e) {
throw new RuntimeException(e);
}
+
+ databaseConditionsManager.getLogger().info("loading conditions set..." + '\n' + conditionsRecord);
// Get the table name.
String tableName = conditionsRecord.getTableName();
@@ -208,4 +210,4 @@
return "ConditionsObjectConverter: type = " + this.getType() +
", multipleCollectionsAction = " + this.getMultipleCollectionsAction().toString();
}
-}
+}
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java Sun Feb 15 00:02:22 2015
@@ -60,6 +60,10 @@
public class DatabaseConditionsManager extends ConditionsManagerImplementation {
protected static Logger logger = LogUtil.create(DatabaseConditionsManager.class);
+ static {
+ logger.setLevel(Level.FINE);
+ logger.getHandlers()[0].setLevel(Level.FINE);
+ }
// Registry of conditions converters.
protected ConverterRegistry converters = ConverterRegistry.create();
@@ -123,7 +127,6 @@
* manager as the global default.
*/
public DatabaseConditionsManager() {
- logger.setLevel(Level.INFO);
registerConditionsConverter(new DetectorConditionsConverter());
setupConnectionFromSystemProperty();
ConditionsManager.setDefaultConditionsManager(this);
@@ -408,7 +411,7 @@
* @return The conditions or null if does not exist.
*/
public <T> T getConditionsData(Class<T> type, String name) {
- logger.fine("getting conditions " + name + " of type " + type.getSimpleName());
+ logger.info("getting conditions " + name + " of type " + type.getSimpleName());
return getCachedConditions(type, name).getCachedData();
}
@@ -571,7 +574,6 @@
logger.config("setting log level to " + level);
logger.setLevel(level);
logger.getHandlers()[0].setLevel(level);
-
svtSetup.setLogLevel(level);
}
@@ -597,7 +599,7 @@
}
if (foundConditionsRecords.size() > 0) {
for (ConditionsRecord record : foundConditionsRecords) {
- logger.fine("found ConditionsRecord with key " + name + '\n' + record.toString());
+ logger.info("found ConditionsRecord with key " + name + '\n' + record.toString());
}
}
return foundConditionsRecords;
@@ -725,7 +727,6 @@
String sql = QueryBuilder.buildPreparedInsert(tableMetaData.getTableName(), collection.iterator().next());
preparedStatement = connection.prepareStatement(sql);
logger.finest("using prepared statement: " + sql);
- logger.finest("preparing updates ...");
int collectionId = collection.getCollectionId();
for (ConditionsObject object : collection) {
preparedStatement.setObject(1, collectionId);
@@ -736,7 +737,6 @@
}
preparedStatement.executeUpdate();
}
- logger.finest("done preparing updates");
connection.commit();
logger.finest("committed transaction");
} catch (Exception e) {
@@ -786,7 +786,7 @@
* if they do not have their own logger.
* @return The Logger for this class.
*/
- public Logger getLogger() {
+ public static Logger getLogger() {
return logger;
}
@@ -959,4 +959,4 @@
DriverManager.setLoginTimeout(Integer.parseInt(element.getText()));
}
}
-}
+}
|