embulk-input-sftp 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e5bb47c115c41e13799cbfcf46671af322f84e2
-  data.tar.gz: eb38505bcf11e80baa8479fe3288865dddb6cd72
+  metadata.gz: 8b8b4aab224c69ba312142fbe2670aa8c54d7554
+  data.tar.gz: 1273126ed13973cd72c0ddf60d6eb1bcfe010344
 SHA512:
-  metadata.gz: 8f79bab7d1840e2be3e99514acea0ead21f2241b0a082b31b65ef5aa5319c7705afc07e0efdb7047ec071b3e3c285a8ff93a9371096e08b1c52c748e19a4429a
-  data.tar.gz: 6d3b85448f45f749cca6c4fb125f64bcb00b8793e2c935fe2a0896c0841e3922cfda9e196c4fd9937010643b37d094e245b7b1248afc788856b82281a36520a2
+  metadata.gz: 155d7ce767e29ef9dbba5fd310d9b8e08d2e9f3441989f1099c8cf26aaec078ba2a36bede8a489c28e7d0313c4dc38efa921c9f955488a29f3d659c7206cf9e9
+  data.tar.gz: bb1a68a8c84189a69d01f17f2b3f6e812eff60abd66a3781e063065ebda7a8aa28d414612347284fae1f66fb25c94c9828aca349c6f2dde31e245857033feacd

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.7 - 2018-03-02
+* [maintenance] Fix SFTP connection remaining problem [#27](https://github.com/sakama/embulk-input-sftp/pull/27)
+
 ## 0.2.6 - 2018-01-15
 - [maintenance] Upgrade "commons-vfs2", "com.jcraft:jsch" and "commons-io:commons-io"
   - https://github.com/embulk/embulk-input-sftp/pull/25

data/build.gradle

@@ -16,7 +16,7 @@ configurations {
 }
 
 group = "org.embulk.input.sftp"
-version = "0.2.6"
+version = "0.2.7"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/src/main/java/org/embulk/input/sftp/SftpFileInput.java

@@ -56,6 +56,7 @@ public class SftpFileInput
     @Override
     public void close()
     {
+        super.close();
     }
 
     private static StandardFileSystemManager initializeStandardFileSystemManager()
@@ -189,43 +190,49 @@ public class SftpFileInput
                         {
                             String lastKey = null;
                             log.info("Getting to download file list");
-                            StandardFileSystemManager manager = initializeStandardFileSystemManager();
-                            FileSystemOptions fsOptions = initializeFsOptions(task);
+                            StandardFileSystemManager manager = null;
+                            try {
+                                manager = initializeStandardFileSystemManager();
+                                FileSystemOptions fsOptions = initializeFsOptions(task);
 
-                            if (task.getLastPath().isPresent() && !task.getLastPath().get().isEmpty()) {
-                                lastKey = manager.resolveFile(getSftpFileUri(task, task.getLastPath().get()), fsOptions).toString();
-                            }
+                                if (task.getLastPath().isPresent() && !task.getLastPath().get().isEmpty()) {
+                                    lastKey = manager.resolveFile(getSftpFileUri(task, task.getLastPath().get()), fsOptions).toString();
+                                }
 
-                            FileObject files = manager.resolveFile(getSftpFileUri(task, task.getPathPrefix()), fsOptions);
+                                FileObject files = manager.resolveFile(getSftpFileUri(task, task.getPathPrefix()), fsOptions);
 
-                            if (files.isFolder()) {
-                                //path_prefix is a folder, we add everything in that folder
-                                FileObject[] children = files.getChildren();
-                                Arrays.sort(children);
-                                for (FileObject f : children) {
-                                    if (f.isFile()) {
-                                        addFileToList(builder, f.toString(), f.getContent().getSize(), "", lastKey);
+                                if (files.isFolder()) {
+                                    //path_prefix is a folder, we add everything in that folder
+                                    FileObject[] children = files.getChildren();
+                                    Arrays.sort(children);
+                                    for (FileObject f : children) {
+                                        if (f.isFile()) {
+                                            addFileToList(builder, f.toString(), f.getContent().getSize(), "", lastKey);
+                                        }
+                                    }
+                                } else if (files.isFile()) {
+                                    //path_prefix is a file then we just need to add that file
+                                    addFileToList(builder, files.toString(), files.getContent().getSize(), "", lastKey);
+                                } else {
+                                    // path_prefix is neither file or folder, then we scan the parent folder to file path
+                                    // that match the path_prefix basename
+                                    FileObject parent = files.getParent();
+                                    FileObject[] children = parent.getChildren();
+                                    Arrays.sort(children);
+                                    String fileName = FilenameUtils.getName(task.getPathPrefix());
+                                    for (FileObject f : children) {
+                                        if (f.isFile()) {
+                                            addFileToList(builder, f.toString(), f.getContent().getSize(), fileName, lastKey);
+                                        }
                                     }
                                 }
+                                return builder.build();
                             }
-                            else if (files.isFile()) {
-                                //path_prefix is a file then we just need to add that file
-                                addFileToList(builder, files.toString(), files.getContent().getSize(), "", lastKey);
-                            }
-                            else {
-                                // path_prefix is neither file or folder, then we scan the parent folder to file path
-                                // that match the path_prefix basename
-                                FileObject parent = files.getParent();
-                                FileObject[] children = parent.getChildren();
-                                Arrays.sort(children);
-                                String fileName = FilenameUtils.getName(task.getPathPrefix());
-                                for (FileObject f : children) {
-                                    if (f.isFile()) {
-                                        addFileToList(builder, f.toString(), f.getContent().getSize(), fileName, lastKey);
-                                    }
+                            finally {
+                                if (manager != null) {
+                                    manager.close();
                                 }
                             }
-                            return builder.build();
                         }
 
                         @Override

data/src/main/java/org/embulk/input/sftp/SingleFileProvider.java

@@ -99,5 +99,8 @@ public class SingleFileProvider
     @Override
     public void close()
     {
+        if (manager != null) {
+            manager.close();
+        }
     }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-sftp
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ files:
 - classpath/commons-io-2.6.jar
 - classpath/commons-logging-1.2.jar
 - classpath/commons-vfs2-2.2.jar
-- classpath/embulk-input-sftp-0.2.6.jar
+- classpath/embulk-input-sftp-0.2.7.jar
 - classpath/jsch-0.1.54.jar
 homepage: https://github.com/embulk/embulk-input-sftp
 licenses: