You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/07/24 17:21:51 UTC
[23/50] [abbrv] incubator-usergrid git commit: More consistency in
logging about admin users, using username : email : uuid format.
More consistency in logging about admin users, using username : email : uuid format.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4f8aa2f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4f8aa2f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4f8aa2f3
Branch: refs/heads/USERGRID-869
Commit: 4f8aa2f36fca8c661d627f1748e3994e62107ce4
Parents: 125ffe9
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Jul 17 17:39:25 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Fri Jul 17 17:39:25 2015 -0400
----------------------------------------------------------------------
.../org/apache/usergrid/tools/ImportAdmins.java | 29 ++++++++++++++------
1 file changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4f8aa2f3/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java b/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java
index 7e08a4c..f39ef9b 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java
@@ -462,7 +462,13 @@ public class ImportAdmins extends ToolBase {
} else { // org exists, add original user to it
try {
managementService.addAdminUserToOrganization( userInfo, orgInfo, false );
- logger.debug( "Added user {} to org {}", new Object[]{user.getEmail(), orgName} );
+ logger.debug( "Added to org user {}:{}:{}",
+ new Object[]{
+ orgInfo.getName(),
+ user.getUsername(),
+ user.getEmail(),
+ user.getUuid()
+ });
} catch (Exception e) {
logger.error( "Error Adding user {} to org {}", new Object[]{user.getEmail(), orgName} );
@@ -533,7 +539,9 @@ public class ImportAdmins extends ToolBase {
logger.debug( "Created new org {} for user {}:{}:{} from duplicate user {}:{}",
new Object[]{
orgInfo.getName(),
- originalUser.getUuid(), originalUser.getUsername(), originalUser.getEmail(),
+ originalUser.getUsername(),
+ originalUser.getEmail(),
+ originalUser.getUuid(),
dup.username, dup.email
});
@@ -546,7 +554,9 @@ public class ImportAdmins extends ToolBase {
logger.debug( "Added to org user {}:{}:{} from duplicate user {}:{}",
new Object[]{
orgInfo.getName(),
- originalUser.getUuid(), originalUser.getUsername(), originalUser.getEmail(),
+ originalUser.getUsername(),
+ originalUser.getEmail(),
+ originalUser.getUuid(),
dup.username, dup.email
});
@@ -686,7 +696,7 @@ public class ImportAdmins extends ToolBase {
while (!done) {
try {
- ImportMetadataTask task = this.workQueue.poll(30, TimeUnit.SECONDS);
+ ImportMetadataTask task = this.workQueue.poll( 30, TimeUnit.SECONDS );
if (task == null) {
logger.warn("Reading from metadata queue was null!");
@@ -694,11 +704,11 @@ public class ImportAdmins extends ToolBase {
Thread.sleep(1000);
continue;
}
- metadataEmptyCount.set(0);
+ metadataEmptyCount.set( 0 );
long startTime = System.currentTimeMillis();
- importEntityMetadata(em, task.entityRef, task.metadata);
+ importEntityMetadata( em, task.entityRef, task.metadata );
long stopTime = System.currentTimeMillis();
long duration = stopTime - startTime;
@@ -770,7 +780,7 @@ public class ImportAdmins extends ToolBase {
em.create(uuid, type, entityProps);
logger.debug( "Imported admin user {}:{}:{}",
- new Object[] { uuid, entityProps.get( "username" ), entityProps.get("email") } );
+ new Object[] { entityProps.get( "username" ), entityProps.get("email"), uuid } );
userCount.getAndIncrement();
auditQueue.put(entityProps);
@@ -805,7 +815,10 @@ public class ImportAdmins extends ToolBase {
private void handleDuplicateAccount(EntityManager em, String dupProperty, Map<String, Object> entityProps ) {
logger.info( "Processing duplicate user {}:{}:{} with duplicate {}", new Object[]{
- entityProps.get( "uuid" ), entityProps.get( "username" ), entityProps.get( "email" ), dupProperty} );
+ entityProps.get( "username" ),
+ entityProps.get( "email" ),
+ entityProps.get( "uuid" ),
+ dupProperty} );
UUID dupUuid = UUID.fromString( entityProps.get("uuid").toString() );
try {