PR Feedback for #647 - Error out when both params set

Author: Steve Ramage

database/mongodb/mongodb.go

@@ -37,7 +37,8 @@ const contextWaitTimeout = 5 * time.Second               // how long to wait for
 
 var (
 	ErrNoDatabaseName = fmt.Errorf("no database name")
-	ErrNilConfig      = fmt.Errorf("no config")
+	ErrNilConfig             = fmt.Errorf("no config")
+	ErrTypoAndNotNonTypoUsed = fmt.Errorf("both x-advisory-lock-timeout-interval and x-advisory-lock-timout-interval were specified")
 )
 
 type Mongo struct {
@@ -138,11 +139,17 @@ func (m *Mongo) Open(dsn string) (database.Driver, error) {
 		return nil, err
 	}
 
-	lockTimeout := unknown.Get("x-advisory-lock-timeout-interval")
+	lockTimeoutIntervalValue := unknown.Get("x-advisory-lock-timeout-interval")
+	// The initial release had a typo for this argument but for backwards compatibility sake, we will keep supporting it
+	// and we will error out if both values are set.
+	lockTimeoutIntervalValueFromTypo := unknown.Get("x-advisory-lock-timout-interval")
 
-	if lockTimeout == "" {
-		// The initial release had a typo for this argument but for backwards compatibility sake, we will keep supporting it.
-		lockTimeout = unknown.Get("x-advisory-lock-timout-interval")
+	lockTimeout := lockTimeoutIntervalValue
+
+	if (lockTimeoutIntervalValue != "" && lockTimeoutIntervalValueFromTypo != "") {
+		return nil, ErrTypoAndNotNonTypoUsed
+	} else if (lockTimeoutIntervalValueFromTypo != "") {
+		lockTimeout = lockTimeoutIntervalValueFromTypo
 	}
 
 	maxLockCheckInterval, err := parseInt(lockTimeout, DefaultLockTimeoutInterval)