Skip to content

Commit

Permalink
Bug 501841 - Add more logging to controllers
Browse files Browse the repository at this point in the history
* Further logging for Commit controller gathering and presenting changes
* Version creation on server

Change-Id: I2b0112428bb57736d51659a3b84b7d31756237ce
Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>
  • Loading branch information
jfaltermeier committed Jan 26, 2017
1 parent 6e47b3a commit b454b04
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ private PrimaryVersionSpec commit(final String logMessage, final BranchVersionSp

getProgressMonitor().worked(10);
getProgressMonitor().subTask(Messages.CommitController_GatheringChanges);
EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Gathering changes...", //$NON-NLS-1$
getProjectSpace(), branch, getUsersession());

final AbstractChangePackage localChangePackage = getProjectSpace().getLocalChangePackage();

Expand All @@ -147,7 +149,12 @@ private PrimaryVersionSpec commit(final String logMessage, final BranchVersionSp
final ModelElementIdToEObjectMappingImpl idToEObjectMapping = new ModelElementIdToEObjectMappingImpl(
getProjectSpace().getProject(), localChangePackage);

EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Gathering changes... done", //$NON-NLS-1$
getProjectSpace(), branch, getUsersession());

getProgressMonitor().subTask(Messages.CommitController_PresentingChanges);
EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Presenting changes...", //$NON-NLS-1$
getProjectSpace(), branch, getUsersession());
if (!callback.inspectChanges(getProjectSpace().toAPI(),
localChangePackage.toAPI(),
idToEObjectMapping.toAPI())
Expand All @@ -157,6 +164,8 @@ private PrimaryVersionSpec commit(final String logMessage, final BranchVersionSp

return getProjectSpace().getBaseVersion();
}
EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Presenting changes... done", //$NON-NLS-1$
getProjectSpace(), branch, getUsersession());

getProgressMonitor().subTask(Messages.CommitController_SendingFilesToServer);
// TODO reimplement with ObserverBus and think about subtasks for commit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,11 @@ public PrimaryVersionSpec createVersion(SessionId sessionId, ProjectId projectId
final ACUser user = (ACUser) ESUserImpl.class.cast(copyAndResolveUser).toInternalAPI();
sanityCheckObjects(sessionId, projectId, baseVersionSpec, changePackage, logMessage);

final ProjectHistory projectHistory = getSubInterface(ProjectSubInterfaceImpl.class).getProject(projectId);
ModelUtil.logProjectDetails("Creating version on server...", user.getName(), projectHistory.getProjectName(), //$NON-NLS-1$
projectHistory.getProjectId().getId(), targetBranch != null ? targetBranch.getBranch() : null,
baseVersionSpec.getIdentifier());

if (FileBasedChangePackage.class.isInstance(changePackage)
&& !ServerConfiguration.useFileBasedChangePackageOnServer()) {
// File-based change package should never arrive here in production mode
Expand All @@ -386,8 +391,14 @@ public PrimaryVersionSpec createVersion(SessionId sessionId, ProjectId projectId
throw new ESException(Messages.VersionSubInterfaceImpl_FileBasedChangePackageExpected);
}

return internalCreateVersion(projectId, baseVersionSpec, changePackage, targetBranch, sourceVersion,
logMessage, user);
final PrimaryVersionSpec result = internalCreateVersion(projectId, baseVersionSpec, changePackage, targetBranch,
sourceVersion, logMessage, user);

ModelUtil.logProjectDetails("Creating version on server... done", user.getName(), //$NON-NLS-1$
projectHistory.getProjectName(), projectHistory.getProjectId().getId(), targetBranch != null ? targetBranch.getBranch() : null,
baseVersionSpec.getIdentifier());

return result;
}

private PrimaryVersionSpec internalCreateVersion(ProjectId projectId, PrimaryVersionSpec baseVersionSpec,
Expand Down

0 comments on commit b454b04

Please sign in to comment.