embulk-output-ftp 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1235e5dc7f3eea1852b1bb9a78f0e0f4dd99cf9d
-  data.tar.gz: 8b73b609b94b5d2f00a95b13aaf7d416d2716248
+  metadata.gz: 94a88449e154fbbfecf92cd8485a113593f18a25
+  data.tar.gz: aa3623b5ecbf40b048c64d45048e4701ecaf0a2f
 SHA512:
-  metadata.gz: cd0b1ffc89da7fd8e8a0a204503b3fc6bfb6d71760054a3708e6691e87d5c8ab75e5ce5075d64ab54e0925fadb18c0d05c4d2132ad6967757934b09ea7fe2f7c
-  data.tar.gz: bd01eb4835cbced4fb699b9a78bf2dbef3eba47461870ed8974ebbbd46a470b0ff4c48260e5079b8ce794a89f44b13b6d55d5619612cf792446425507e4db04d
+  metadata.gz: fff7e207c69d760a2eaf7928c804719396a21d0d45895e9f35331304608d5c69294784ed601f7a64ac087abedb3923b9b5e5e154f43da35e7db04142757ddfa5
+  data.tar.gz: 8947a389dc42ca8a90b15b6b9856b3a4bb22b52307431cfb0916238830ba056d7c9853d902f9a45c1a6a9a0be7592d8a3cd17136be15a27136c6af224f37b712

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.7 - 2017-02-24
+
+* [maintenance] Don't retry when Code:550(Permission denied) error happens [#13](https://github.com/embulk/embulk-output-ftp/pull/13)
+
 ## 0.1.6 - 2016-09-09
 
 * [maintenance] Fix NullPointerException at FtpFileOutput.getRemoteDirectory() method [#12](https://github.com/embulk/embulk-output-ftp/pull/12)

data/build.gradle

@@ -14,7 +14,7 @@ configurations {
     provided
 }
 
-version = "0.1.6"
+version = "0.1.7"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/src/main/java/org/embulk/output/ftp/FtpFileOutputPlugin.java

@@ -18,6 +18,7 @@ import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
 import org.embulk.config.TaskReport;
 import org.embulk.config.TaskSource;
+import org.embulk.config.UserDataException;
 import org.embulk.output.ftp.SSLPlugins.SSLPluginConfig;
 import org.embulk.spi.Buffer;
 import org.embulk.spi.Exec;
@@ -249,7 +250,15 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
                                         client.changeDirectory(remoteDirectory);
                                     }
                                     catch (FTPException e) {
-                                        client.createDirectory(remoteDirectory);
+                                        try {
+                                            client.createDirectory(remoteDirectory);
+                                        }
+                                        catch (FTPException e1) {
+                                            if (e1.getCode() == 550) {
+                                                // Create directory operation failed
+                                                throw new OperationDeniedException(e1);
+                                            }
+                                        }
                                     }
                                     client.upload(filePath,
                                             new BufferedInputStream(new FileInputStream(file)), 0L, 0L,
@@ -275,6 +284,9 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
                                     if (exception instanceof ConfigException) {
                                         throw new RetryGiveupException(exception);
                                     }
+                                    else if (exception instanceof OperationDeniedException) {
+                                        throw new ConfigException(exception);
+                                    }
                                     String message = String.format("FTP put request failed. Retrying %d/%d after %d seconds. Message: %s",
                                             retryCount, retryLimit, retryWait / 1000, exception.getMessage());
                                     if (retryCount % 3 == 0) {
@@ -329,6 +341,23 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
             }
             return parent;
         }
+
+        public class OperationDeniedException extends RuntimeException implements UserDataException
+        {
+            protected OperationDeniedException()
+            {
+            }
+
+            public OperationDeniedException(String message)
+            {
+                super(message);
+            }
+
+            public OperationDeniedException(Throwable cause)
+            {
+                super(cause);
+            }
+        }
     }
 
     private static FTPClient newFTPClient(Logger log, PluginTask task)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-ftp
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ files:
 - src/test/resources/sample_02.csv
 - classpath/bcpkix-jdk15on-1.52.jar
 - classpath/bcprov-jdk15on-1.52.jar
-- classpath/embulk-output-ftp-0.1.6.jar
+- classpath/embulk-output-ftp-0.1.7.jar
 - classpath/ftp4j-1.7.2.jar
 homepage: https://github.com/embulk/embulk-output-ftp
 licenses: