Merge pull request #40 from embulk/do_not_retry_connection_refused

sakama · web-flow · commit dabc063631cc · 2019-07-25T16:18:16.000+09:00
Do not retry when "Connection refused" is returned and throw ConfigException
diff --git a/src/main/java/org/embulk/input/sftp/SftpFileInput.java b/src/main/java/org/embulk/input/sftp/SftpFileInput.java
@@ -266,8 +266,10 @@ public boolean isRetryableException(Exception exception)
                         {
                             if (exception.getCause() != null && exception.getCause().getCause() != null) {
                                 Throwable cause = exception.getCause().getCause();
-                                if (cause.getMessage() != null && cause.getMessage().contains("Auth fail")) {
-                                    throw new ConfigException(exception);
+                                if (cause.getMessage() != null) {
+                                    if (cause.getMessage().contains("Auth fail") || cause.getMessage().contains("Connection refused")) {
+                                        throw new ConfigException(exception);
+                                    }
                                 }
                             }
                             if (exception instanceof ConfigException) {

Original file line number	Diff line number	Diff line change
`@@ -266,8 +266,10 @@ public boolean isRetryableException(Exception exception)`
`266`	`266`	`{`
`267`	`267`	`if (exception.getCause() != null && exception.getCause().getCause() != null) {`
`268`	`268`	`Throwable cause = exception.getCause().getCause();`
`269`		`- if (cause.getMessage() != null && cause.getMessage().contains("Auth fail")) {`
`270`		`- throw new ConfigException(exception);`
	`269`	`+ if (cause.getMessage() != null) {`
	`270`	`+ if (cause.getMessage().contains("Auth fail") \|\| cause.getMessage().contains("Connection refused")) {`
	`271`	`+ throw new ConfigException(exception);`
	`272`	`+ }`
`271`	`273`	`}`
`272`	`274`	`}`
`273`	`275`	`if (exception instanceof ConfigException) {`