Add parseIntNonNegative to allow 0 or larger values to ConnMaxLifetim…

…eMilliseconds
mattermost · Jun 27, 2018 · 0c40911 · 0c40911
1 parent 1590023
commit 0c40911
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/components/admin_console/admin_settings.jsx b/components/admin_console/admin_settings.jsx
@@ -127,6 +127,19 @@ export default class AdminSettings extends React.Component {
  return n;
  };
 
+ parseIntNonNegative = (str, defaultValue) => {
+ const n = parseInt(str, 10);
+
+ if (isNaN(n) || n < 0) {
+ if (defaultValue) {
+ return defaultValue;
+ }
+ return 0;
+ }
+
+ return n;
+ };
+
  parseIntNonZero = (str, defaultValue) => {
  const n = parseInt(str, 10);
 

diff --git a/components/admin_console/database_settings.jsx b/components/admin_console/database_settings.jsx
@@ -25,7 +25,7 @@ export default class DatabaseSettings extends AdminSettings {
 
  getConfigFromState(config) {
  // driverName and dataSource are read-only from the UI
- config.SqlSettings.ConnMaxLifetimeMilliseconds = this.parseInt(this.state.connMaxLifetimeMilliseconds);
+ config.SqlSettings.ConnMaxLifetimeMilliseconds = this.parseIntNonNegative(this.state.connMaxLifetimeMilliseconds);
  config.SqlSettings.MaxIdleConns = this.parseIntNonZero(this.state.maxIdleConns);
  config.SqlSettings.MaxOpenConns = this.parseIntNonZero(this.state.maxOpenConns);
  config.SqlSettings.AtRestEncryptKey = this.state.atRestEncryptKey;