Skip to content

Commit 9e3c7f7

Browse files
committed
add quotes for path logging
1 parent c6736b7 commit 9e3c7f7

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,9 +688,9 @@ public void update() throws IOException {
688688

689689
args.curCount = 0;
690690
Statistics elapsed = new Statistics();
691-
LOGGER.log(Level.INFO, "Starting indexing of directory {0}", dir);
691+
LOGGER.log(Level.INFO, "Starting indexing of directory ''{0}''", dir);
692692
indexParallel(dir, args);
693-
elapsed.report(LOGGER, String.format("Done indexing of directory %s", dir),
693+
elapsed.report(LOGGER, String.format("Done indexing of directory '%s'", dir),
694694
"indexer.db.directory.index");
695695

696696
/*

opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -997,9 +997,9 @@ private static void configureFileAnalyzer(String fileSpec, String analyzer) {
997997
*/
998998
public static void writeConfigToFile(RuntimeEnvironment env, String filename) throws IOException {
999999
if (filename != null) {
1000-
LOGGER.log(Level.INFO, "Writing configuration to {0}", filename);
1000+
LOGGER.log(Level.INFO, "Writing configuration to ''{0}''", filename);
10011001
env.writeConfiguration(new File(filename));
1002-
LOGGER.log(Level.INFO, "Done writing configuration to {0}", filename);
1002+
LOGGER.log(Level.INFO, "Done writing configuration to ''{0}''", filename);
10031003
}
10041004
}
10051005

opengrok-indexer/src/main/java/org/opengrok/indexer/index/PendingFileCompleter.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,9 @@ private void doDelete(PendingFileDeletionExec del) {
363363

364364
private void doDelete(File f) {
365365
if (f.delete()) {
366-
LOGGER.log(Level.FINER, "Deleted obsolete file: {0}", f.getPath());
366+
LOGGER.log(Level.FINER, "Deleted obsolete file: ''{0}''", f.getPath());
367367
} else if (f.exists()) {
368-
LOGGER.log(Level.WARNING, "Failed to delete obsolete file: {0}",
368+
LOGGER.log(Level.WARNING, "Failed to delete obsolete file: ''{0}''",
369369
f.getPath());
370370
}
371371
}
@@ -375,12 +375,12 @@ private void doRename(PendingFileRenamingExec ren) throws IOException {
375375
Files.move(Paths.get(ren.source), Paths.get(ren.target),
376376
StandardCopyOption.REPLACE_EXISTING);
377377
} catch (IOException e) {
378-
LOGGER.log(Level.WARNING, "Failed to move file: {0} -> {1}",
378+
LOGGER.log(Level.WARNING, "Failed to move file: ''{0}'' -> ''{1}''",
379379
new Object[]{ren.source, ren.target});
380380
throw e;
381381
}
382382
if (LOGGER.isLoggable(Level.FINEST)) {
383-
LOGGER.log(Level.FINEST, "Moved pending as file: {0}",
383+
LOGGER.log(Level.FINEST, "Moved pending as file: ''{0}''",
384384
ren.target);
385385
}
386386
}
@@ -411,13 +411,13 @@ private void doLink(PendingSymlinkageExec lnk) throws IOException {
411411
// there is no need to worry.
412412
return;
413413
} catch (IOException e) {
414-
LOGGER.log(Level.WARNING, "Failed to link: {0} -> {1}",
414+
LOGGER.log(Level.WARNING, "Failed to link: ''{0}'' -> ''{1}''",
415415
new Object[]{lnk.source, lnk.targetRel});
416416
throw e;
417417
}
418418

419419
if (LOGGER.isLoggable(Level.FINEST)) {
420-
LOGGER.log(Level.FINEST, "Linked pending: {0} -> {1}",
420+
LOGGER.log(Level.FINEST, "Linked pending: ''{0}'' -> ''{1}''",
421421
new Object[]{lnk.source, lnk.targetRel});
422422
}
423423
}
@@ -499,7 +499,7 @@ private void tryDeleteParents(List<PendingFileDeletionExec> dels) {
499499

500500
private void tryDeleteDirectory(File dir) {
501501
if (dir.delete()) {
502-
LOGGER.log(Level.FINE, "Removed empty parent dir: {0}",
502+
LOGGER.log(Level.FINE, "Removed empty parent directory: ''{0}''",
503503
dir.getAbsolutePath());
504504
}
505505
}
@@ -525,7 +525,7 @@ private void findFilelessChildren(SkeletonDirs skels, File directory) {
525525
if (!didLogFileTopLevelIneligible && LOGGER.isLoggable(
526526
Level.FINEST)) {
527527
didLogFileTopLevelIneligible = true; // just once is OK
528-
LOGGER.log(Level.FINEST, "not file-less due to: {0}",
528+
LOGGER.log(Level.FINEST, "not file-less due to: ''{0}''",
529529
f.getAbsolutePath());
530530
}
531531
} else {
@@ -536,7 +536,7 @@ private void findFilelessChildren(SkeletonDirs skels, File directory) {
536536
topLevelIneligible = true;
537537
if (LOGGER.isLoggable(Level.FINEST)) {
538538
LOGGER.log(Level.FINEST,
539-
"its children prevent delete: {0}",
539+
"its children prevent delete: ''{0}''",
540540
f.getAbsolutePath());
541541
}
542542
}
@@ -549,8 +549,7 @@ private void findFilelessChildren(SkeletonDirs skels, File directory) {
549549
} catch (IOException ex) {
550550
topLevelIneligible = true;
551551
if (LOGGER.isLoggable(Level.FINEST)) {
552-
LOGGER.log(Level.FINEST, "Failed to stream directory:" +
553-
directory, ex);
552+
LOGGER.log(Level.FINEST, String.format("Failed to stream directory '%s'", directory), ex);
554553
}
555554
}
556555

0 commit comments

Comments
 (0)