Skip to content

Commit

Permalink
add ftp.alt.protocol to enable HTTP protocol if FTP is not working
Browse files Browse the repository at this point in the history
  • Loading branch information
pgdurand committed Mar 29, 2021
1 parent 2482008 commit 6df1693
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
Binary file removed jar/pb-core-6.3.1.jar
Binary file not shown.
10 changes: 10 additions & 0 deletions src/bzh/plealog/dbmirror/fetcher/DBServerConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ public class DBServerConfig {
private static final String FTPPSWD_KEY = "ftp.pswd";
private static final String FTPRDIR_KEY = "ftp.rdir";
private static final String FTPRDIR_EXCL_KEY = "ftp.rdir.exclude";
private static final String FTPALT_PROTOCOL_KEY = "ftp.alt.protocol";


private static final String ASPERAUSE_KEY = "aspera.use";
private static final String ASPERASERVER_KEY = "aspera.server";
private static final String ASPERAARGS_KEY = "aspera.args";
Expand Down Expand Up @@ -115,6 +117,7 @@ public class DBServerConfig {
DBDESC_KEY, DBTYPE_KEY, DBLDIR_KEY, DBINCFILES_KEY, DBEXCFILES_KEY,
DBDTFROM_KEY, DBDTTO_KEY, TASKS_U_POST, TASKS_G_POST, FTPSERVER_KEY,
FTPPORT_KEY, FTPUNAME_KEY, FTPPSWD_KEY, FTPRDIR_KEY, FTPRDIR_EXCL_KEY,
FTPALT_PROTOCOL_KEY,
LOCALRDIR_KEY, LOCALRDIR_EXCL_KEY, ASPERAUSE_KEY, ASPERASERVER_KEY,
ASPERAARGS_KEY, KEEP_HISTORY_KEY, DB_DEPENDS };

Expand Down Expand Up @@ -612,6 +615,13 @@ public String getRemotePatternsToExclude() {
return _properties.getProperty(FTPRDIR_EXCL_KEY);
}

/**
* Returns protocol to use as an alternative to FTP.
*/
public String getFTPAternativeProtocol() {
return _properties.getProperty(FTPALT_PROTOCOL_KEY);
}

private String getNotNullProperty(String key) {
String value = _properties.getProperty(key);
if (value==null) {
Expand Down

0 comments on commit 6df1693

Please sign in to comment.