Browse Source

ObjectDirectory: Clean up logging

Externalize the message and log the pack file with absolute path.

Change-Id: I019052dfae8fd96ab67da08b3287d699287004cb
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-5.1
David Pursehouse 6 years ago
parent
commit
9665d86ba1
  1. 1
      org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
  2. 1
      org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
  3. 7
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java

1
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties

@ -712,6 +712,7 @@ truncatedHunkOldLinesMissing=Truncated hunk, at least {0} old lines is missing
tSizeMustBeGreaterOrEqual1=tSize must be >= 1 tSizeMustBeGreaterOrEqual1=tSize must be >= 1
unableToCheckConnectivity=Unable to check connectivity. unableToCheckConnectivity=Unable to check connectivity.
unableToCreateNewObject=Unable to create new object: {0} unableToCreateNewObject=Unable to create new object: {0}
unableToReadPackfile=Unable to read packfile {0}
unableToRemovePath=Unable to remove path ''{0}'' unableToRemovePath=Unable to remove path ''{0}''
unableToStore=Unable to store {0}. unableToStore=Unable to store {0}.
unableToWrite=Unable to write {0} unableToWrite=Unable to write {0}

1
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java

@ -773,6 +773,7 @@ public class JGitText extends TranslationBundle {
/***/ public String tSizeMustBeGreaterOrEqual1; /***/ public String tSizeMustBeGreaterOrEqual1;
/***/ public String unableToCheckConnectivity; /***/ public String unableToCheckConnectivity;
/***/ public String unableToCreateNewObject; /***/ public String unableToCreateNewObject;
/***/ public String unableToReadPackfile;
/***/ public String unableToRemovePath; /***/ public String unableToRemovePath;
/***/ public String unableToStore; /***/ public String unableToStore;
/***/ public String unableToWrite; /***/ public String unableToWrite;

7
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java

@ -360,7 +360,9 @@ public class ObjectDirectory extends FileObjectDatabase {
// The hasObject call should have only touched the index, // The hasObject call should have only touched the index,
// so any failure here indicates the index is unreadable // so any failure here indicates the index is unreadable
// by this process, and the pack is likewise not readable. // by this process, and the pack is likewise not readable.
LOG.warn("Unable to read packfile " + p.getPackFile(), e); LOG.warn(MessageFormat.format(
JGitText.get().unableToReadPackfile,
p.getPackFile().getAbsolutePath()), e);
removePack(p); removePack(p);
} }
} }
@ -653,7 +655,8 @@ public class ObjectDirectory extends FileObjectDatabase {
if ((e instanceof CorruptObjectException) if ((e instanceof CorruptObjectException)
|| (e instanceof PackInvalidException)) { || (e instanceof PackInvalidException)) {
warnTmpl = JGitText.get().corruptPack; warnTmpl = JGitText.get().corruptPack;
LOG.warn("Packfile " + p.getPackFile() + " is corrupted", e); LOG.warn(MessageFormat.format(warnTmpl,
p.getPackFile().getAbsolutePath()), e);
// Assume the pack is corrupted, and remove it from the list. // Assume the pack is corrupted, and remove it from the list.
removePack(p); removePack(p);
} else if (e instanceof FileNotFoundException) { } else if (e instanceof FileNotFoundException) {

Loading…
Cancel
Save