Skip to content

DATAMONGO-961 - Improve logging message handling in MongoDbUtils. #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

DATAMONGO-961 - Improve logging message handling in MongoDbUtils. #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abd24d0
DATAMONGO-961 - Improve logging message handling in MongoDbUtils.
Jun 24, 2014
538ac3c
DATAMONGO-961 - Improve logging message handling in MongoDbUtils.
Jun 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb-parent</artifactId>
<version>1.6.0.BUILD-SNAPSHOT</version>
<version>1.6.0.DATAMONGO-961-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Spring Data MongoDB</name>
Expand Down
4 changes: 2 additions & 2 deletions spring-data-mongodb-cross-store/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb-parent</artifactId>
<version>1.6.0.BUILD-SNAPSHOT</version>
<version>1.6.0.DATAMONGO-961-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -48,7 +48,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb</artifactId>
<version>1.6.0.BUILD-SNAPSHOT</version>
<version>1.6.0.DATAMONGO-961-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion spring-data-mongodb-distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb-parent</artifactId>
<version>1.6.0.BUILD-SNAPSHOT</version>
<version>1.6.0.DATAMONGO-961-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion spring-data-mongodb-log4j/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb-parent</artifactId>
<version>1.6.0.BUILD-SNAPSHOT</version>
<version>1.6.0.DATAMONGO-961-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion spring-data-mongodb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb-parent</artifactId>
<version>1.6.0.BUILD-SNAPSHOT</version>
<version>1.6.0.DATAMONGO-961-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
22 changes: 16 additions & 6 deletions spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDbUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2013 the original author or authors.
* Copyright 2010-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -94,7 +94,9 @@ private static DB doGetDB(Mongo mongo, String databaseName, UserCredentials cred
// DB found but not yet synchronized
if (db != null && !dbHolder.isSynchronizedWithTransaction()) {

LOGGER.debug("Registering Spring transaction synchronization for existing MongoDB {}.", databaseName);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Registering Spring transaction synchronization for existing MongoDB {}.", databaseName);
}

TransactionSynchronizationManager.registerSynchronization(new MongoSynchronization(dbHolder, mongo));
dbHolder.setSynchronizedWithTransaction(true);
Expand All @@ -106,7 +108,9 @@ private static DB doGetDB(Mongo mongo, String databaseName, UserCredentials cred
}

// Lookup fresh database instance
LOGGER.debug("Getting Mongo Database name=[{}]", databaseName);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Getting Mongo Database name=[{}]", databaseName);
}

DB db = mongo.getDB(databaseName);
boolean credentialsGiven = credentials.hasUsername() && credentials.hasPassword();
Expand All @@ -130,7 +134,9 @@ private static DB doGetDB(Mongo mongo, String databaseName, UserCredentials cred
// TX sync active, bind new database to thread
if (TransactionSynchronizationManager.isSynchronizationActive()) {

LOGGER.debug("Registering Spring transaction synchronization for MongoDB instance {}.", databaseName);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Registering Spring transaction synchronization for MongoDB instance {}.", databaseName);
}

DbHolder holderToUse = dbHolder;

Expand Down Expand Up @@ -185,11 +191,15 @@ public static boolean isDBTransactional(DB db, Mongo mongo) {
public static void closeDB(DB db) {

if (db != null) {
LOGGER.debug("Closing Mongo DB object");
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Closing Mongo DB object");
}
try {
db.requestDone();
} catch (Throwable ex) {
LOGGER.debug("Unexpected exception on closing Mongo DB object", ex);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Unexpected exception on closing Mongo DB object", ex);
}
}
}
}
Expand Down