decrease log level for annotation problems (#4083)

vladak · web-flow · commit 8a7aa08e2f11 · 2022-10-31T23:19:40.000+01:00
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevAnnotationParser.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevAnnotationParser.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opengrok.indexer.history;
 
@@ -49,11 +49,14 @@ public class AccuRevAnnotationParser implements Executor.StreamHandler {
      */
     private final Annotation annotation;
 
+    private final String fileName;
+
     /**
      * @param fileName the name of the file being annotated
      */
     public AccuRevAnnotationParser(String fileName) {
         annotation = new Annotation(fileName);
+        this.fileName = fileName;
     }
 
     /**
@@ -85,14 +88,14 @@ public void processStream(InputStream input) throws IOException {
                         String author  = matcher.group(2);
                         annotation.addLine(version, author, true);
                     } else {
-                        LOGGER.log(Level.SEVERE,
-                                "Did not find annotation in line {0}: [{1}]",
-                                new Object[]{lineno, line});
+                        LOGGER.log(Level.WARNING,
+                                "Did not find annotation in line {0} for ''{1}'': [{2}]",
+                                new Object[]{lineno, this.fileName, line});
                     }
                 }
             } catch (IOException e) {
-                LOGGER.log(Level.SEVERE,
-                        "Could not read annotations for " + annotation.getFilename(), e);
+                LOGGER.log(Level.WARNING,
+                        String.format("Could not read annotations for '%s'", this.fileName), e);
             }
         }
     }
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/BazaarAnnotationParser.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/BazaarAnnotationParser.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opengrok.indexer.history;
 
@@ -49,14 +49,16 @@ public class BazaarAnnotationParser implements Executor.StreamHandler {
     /**
      * Pattern used to extract author/revision.
      */
-    private static final Pattern BLAME_PATTERN
-            = Pattern.compile("^\\W*(\\S+)\\W+(\\S+).*$");
+    private static final Pattern BLAME_PATTERN = Pattern.compile("^\\W*(\\S+)\\W+(\\S+).*$");
+
+    private final String fileName;
 
     /**
      * @param fileName the name of the file being annotated
      */
     public BazaarAnnotationParser(String fileName) {
         annotation = new Annotation(fileName);
+        this.fileName = fileName;
     }
 
     /**
@@ -82,9 +84,9 @@ public void processStream(InputStream input) throws IOException {
                     String author = matcher.group(2).trim();
                     annotation.addLine(rev, author, true);
                 } else {
-                    LOGGER.log(Level.SEVERE,
-                            "Error: did not find annotation in line {0}: [{1}]",
-                            new Object[]{String.valueOf(lineno), line});
+                    LOGGER.log(Level.WARNING,
+                            "Error: did not find annotation in line {0} for ''{1}'': [{2}]",
+                            new Object[]{String.valueOf(lineno), this.fileName, line});
                 }
             }
         }
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/CVSAnnotationParser.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/CVSAnnotationParser.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opengrok.indexer.history;
 
@@ -43,19 +43,21 @@ public class CVSAnnotationParser implements Executor.StreamHandler {
     /**
      * Pattern used to extract author/revision from {@code cvs annotate}.
      */
-    private static final Pattern ANNOTATE_PATTERN
-            = Pattern.compile("([\\.\\d]+)\\W+\\((\\w+)");
+    private static final Pattern ANNOTATE_PATTERN = Pattern.compile("([\\.\\d]+)\\W+\\((\\w+)");
 
     /**
      * Store annotation created by processStream.
      */
     private final Annotation annotation;
 
+    private final String fileName;
+
     /**
      * @param fileName the name of the file being annotated
      */
     public CVSAnnotationParser(String fileName) {
         annotation = new Annotation(fileName);
+        this.fileName = fileName;
     }
 
     /**
@@ -76,8 +78,7 @@ public void processStream(InputStream input) throws IOException {
         Matcher matcher = ANNOTATE_PATTERN.matcher(line);
         while ((line = in.readLine()) != null) {
             // Skip header
-            if (!hasStarted && (line.length() == 0
-                    || !Character.isDigit(line.charAt(0)))) {
+            if (!hasStarted && (line.length() == 0 || !Character.isDigit(line.charAt(0)))) {
                 continue;
             }
             hasStarted = true;
@@ -90,9 +91,9 @@ public void processStream(InputStream input) throws IOException {
                 String author = matcher.group(2).trim();
                 annotation.addLine(rev, author, true);
             } else {
-                LOGGER.log(Level.SEVERE,
-                        "Error: did not find annotation in line {0}: [{1}]",
-                        new Object[]{String.valueOf(lineno), line});
+                LOGGER.log(Level.WARNING,
+                        "Error: did not find annotation in line {0} for ''{1}'': [{2}]",
+                        new Object[]{String.valueOf(lineno), this.fileName, line});
             }
         }
     }
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/MercurialAnnotationParser.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/MercurialAnnotationParser.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opengrok.indexer.history;
 
@@ -50,8 +50,7 @@ class MercurialAnnotationParser implements Executor.StreamHandler {
     /**
      * Pattern used to extract author/revision from {@code hg annotate}.
      */
-    private static final Pattern ANNOTATION_PATTERN
-            = Pattern.compile("^\\s*(\\d+):");
+    private static final Pattern ANNOTATION_PATTERN = Pattern.compile("^\\s*(\\d+):");
 
     MercurialAnnotationParser(File file, HashMap<String, HistoryEntry> revs) {
         this.file = file;
@@ -78,9 +77,9 @@ public void processStream(InputStream input) throws IOException {
                     }
                     annotation.addLine(rev, Util.getEmail(author.trim()), true);
                 } else {
-                    LOGGER.log(Level.SEVERE,
-                            "Error: did not find annotation in line {0}: [{1}]",
-                            new Object[]{lineno, line});
+                    LOGGER.log(Level.WARNING,
+                            "Error: did not find annotation in line {0} for ''{1}'': [{2}]",
+                            new Object[]{lineno, this.file, line});
                 }
             }
         }
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceAnnotationParser.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceAnnotationParser.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.indexer.history;
@@ -101,14 +101,14 @@ public void processStream(InputStream input) throws IOException {
                     String author = revAuthor.get(revision);
                     annotation.addLine(revision, author, true);
                 } else {
-                    LOGGER.log(Level.SEVERE,
-                            "Error: did not find annotation in line {0}: [{1}]",
-                            new Object[]{lineno, line});
+                    LOGGER.log(Level.WARNING,
+                            "Error: did not find annotation in line {0} for ''{1}'': [{2}]",
+                            new Object[]{lineno, this.file, line});
                 }
             }
         } catch (IOException e) {
-            LOGGER.log(Level.SEVERE,
-                    "Error: Could not read annotations for " + annotation.getFilename(), e);
+            LOGGER.log(Level.WARNING,
+                    String.format("Error: Could not read annotations for '%s'", this.file), e);
         }
     }
 }
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/RCSAnnotationParser.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/RCSAnnotationParser.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opengrok.indexer.history;
 
@@ -67,9 +67,9 @@ public void processStream(InputStream input) throws IOException {
                     String author = matcher.group(2);
                     annotation.addLine(rev, author, true);
                 } else {
-                    LOGGER.log(Level.SEVERE,
-                            "Error: did not find annotation in line {0}: [{1}]",
-                            new Object[]{lineno, line});
+                    LOGGER.log(Level.WARNING,
+                            "Error: did not find annotation in line {0} for ''{1}'': [{2}]",
+                            new Object[]{lineno, this.file, line});
                 }
             }
         }
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/SSCMRepository.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/SSCMRepository.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2018, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.indexer.history;
@@ -333,9 +333,9 @@ protected Annotation parseAnnotation(Reader input, String fileName)
                 String author = matcher.group(1);
                 ret.addLine(rev, author, true);
             } else if (hasStarted) {
-                LOGGER.log(Level.SEVERE,
-                        "Error: did not find annotation in line {0}: [{1}]",
-                        new Object[]{String.valueOf(lineno), line});
+                LOGGER.log(Level.WARNING,
+                        "Error: did not find annotation in line {0} for ''{1}'': [{2}]",
+                        new Object[]{String.valueOf(lineno), fileName, line});
             }
         }
         return ret;

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`
`20`	`20`	`/*`
`21`		`- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.`
	`21`	`+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.`
`22`	`22`	`* Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.`
`23`	`23`	`*/`
`24`	`24`	`package org.opengrok.indexer.history;`
`@@ -101,14 +101,14 @@ public void processStream(InputStream input) throws IOException {`
`101`	`101`	`String author = revAuthor.get(revision);`
`102`	`102`	`annotation.addLine(revision, author, true);`
`103`	`103`	`} else {`
`104`		`- LOGGER.log(Level.SEVERE,`
`105`		`- "Error: did not find annotation in line {0}: [{1}]",`
`106`		`- new Object[]{lineno, line});`
	`104`	`+ LOGGER.log(Level.WARNING,`
	`105`	`+ "Error: did not find annotation in line {0} for ''{1}'': [{2}]",`
	`106`	`+ new Object[]{lineno, this.file, line});`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`	`} catch (IOException e) {`
`110`		`- LOGGER.log(Level.SEVERE,`
`111`		`- "Error: Could not read annotations for " + annotation.getFilename(), e);`
	`110`	`+ LOGGER.log(Level.WARNING,`
	`111`	`+ String.format("Error: Could not read annotations for '%s'", this.file), e);`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`}`