opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.0' into stable-3.1

Browse Source 
* stable-3.0:
  Make toString(), hashCode(), equals() and friends final in AutoValue classes
  Schema_169: Increase log severity level
  Schema_146: Fix FutureReturnValueIgnored warning flagged by error prone
  Fix various usages of the Flogger API
  Schema_169: Fix usage of Flogger to log exception stack trace
  Keep alive database connection to prevent exceeding wait timeout

Change-Id: I8af4a599788e55da4ff50ac513ff7ff910e1938d
This commit is contained in:
David Pursehouse
2020-04-27 16:32:23 +09:00
parent 28f72bffed 8de96a70e5
commit 4beeecddc3
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java
View File

@@ -284,7 +284,7 @@ class OpenIdServiceImpl {
// right now. Instead of blocking all of them log the error and // right now. Instead of blocking all of them log the error and
// let the authentication complete anyway. // let the authentication complete anyway.
// //
logger.atSevere().log("Invalid PAPE response %s: %s", openidIdentifier, err); logger.atSevere().withCause(err).log("Invalid PAPE response from %s", openidIdentifier);
unsupported = true; unsupported = true;
ext = null; ext = null;
} }

3
java/com/google/gerrit/server/config/PluginConfigFactory.java
View File

@@ -230,7 +230,8 @@ public class PluginConfigFactory implements ReloadPluginListener {
cfg.load(); cfg.load();
} catch (ConfigInvalidException e) { } catch (ConfigInvalidException e) {
// This is an error in user input, don't spam logs with a stack trace. // This is an error in user input, don't spam logs with a stack trace.
logger.atWarning().log("Failed to load %s: %s", pluginConfigFile.toAbsolutePath(), e); logger.atWarning().log(
"Failed to load %s: %s", pluginConfigFile.toAbsolutePath(), e.getMessage());
} catch (IOException e) { } catch (IOException e) {
logger.atWarning().withCause(e).log("Failed to load %s", pluginConfigFile.toAbsolutePath()); logger.atWarning().withCause(e).log("Failed to load %s", pluginConfigFile.toAbsolutePath());
} }

4
java/com/google/gerrit/server/patch/Text.java
View File

@@ -162,11 +162,11 @@ public class Text extends RawText {
return Charset.forName(encoding); return Charset.forName(encoding);
} catch (IllegalCharsetNameException err) { } catch (IllegalCharsetNameException err) {
logger.atSevere().log("Invalid detected charset name '%s': %s", encoding, err); logger.atSevere().log("Invalid detected charset name '%s': %s", encoding, err.getMessage());
return ISO_8859_1; return ISO_8859_1;
} catch (UnsupportedCharsetException err) { } catch (UnsupportedCharsetException err) {
logger.atSevere().log("Detected charset '%s' not supported: %s", encoding, err); logger.atSevere().log("Detected charset '%s' not supported: %s", encoding, err.getMessage());
return ISO_8859_1; return ISO_8859_1;
} }
} }