| /impl/src/java/pt/estgp/estgweb/services/courseunits/SaveCourseUnitProgram.java |
|---|
| 174,7 → 174,7 |
| if(client == null) |
| { |
| logger.warn("###################"); |
| logger.warn("################### > CANT CONNECT FTP"); |
| logger.warn("################### > CANT CONNECT FTP - could be FTPTimeout: " + Globals.FTP_TIMEOUT_SECONDS); |
| errors.add("################### > CANT CONNECT FTP to send program " + ((CourseUnitImpl)cu).getSigesUniqueIdentifiers()); |
| return; |
| } |
| 188,7 → 188,10 |
| } |
| else |
| { |
| client.storeFile(cu.getCode() + "_" + cu.getNormalizedName() + "_v" + sdf.format(versionDate) + ".pdf",new FileInputStream(pdfPath)); |
| if(!client.storeFile(cu.getCode() + "_" + cu.getNormalizedName() + "_v" + sdf.format(versionDate) + ".pdf",new FileInputStream(pdfPath))) |
| { |
| errors.add("CANT store file in given time, probably timeout at " + Globals.FTP_DATA_STORE_TIMEOUT_SECONDS); |
| } |
| if(server != null) |
| { |
| /impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportSumariesJson.java |
|---|
| 298,8 → 298,8 |
| if(client == null) |
| { |
| logger.warn("###################"); |
| logger.warn("################### > CANT CONNECT FTP"); |
| serviceLogInfo("################### > CANT CONNECT FTP to send " + ((CourseUnitImpl)cu).getSummariosPathIntranet()); |
| logger.warn("################### > CANT CONNECT FTP - could be FTPTimeout: " + Globals.FTP_TIMEOUT_SECONDS); |
| errors.add("################### > CANT CONNECT FTP to send summaries " + ((CourseUnitImpl)cu).getSummariosPathIntranet()); |
| return; |
| } |
| 314,8 → 314,12 |
| } |
| else |
| { |
| client.storeFile(((CourseUnitImpl)cu).getSummariosFileNameIntranet(),new FileInputStream(pdfPath)); |
| if(!client.storeFile(((CourseUnitImpl)cu).getSummariosFileNameIntranet(),new FileInputStream(pdfPath))) |
| { |
| String msgS = "CANT store file in given time, probably timeout at " + Globals.FTP_DATA_STORE_TIMEOUT_SECONDS; |
| logger.error(msgS); |
| serviceLogError(msgS); |
| } |
| if(server != null) |
| { |
| client.quit(); |
| /impl/src/java/pt/estgp/estgweb/web/FtpServer.java |
|---|
| 209,6 → 209,7 |
| @Override |
| public boolean storeFile(String remote, InputStream local) throws IOException |
| { |
| logger.info("FTP store Timeout protection of " + FTP_DATA_STORE_TIMEOUT_SECONDS); |
| this.remote = remote; |
| this.local = local; |
| Thread t = new Thread(this); |
| 219,13 → 220,12 |
| Thread.sleep(1000); |
| if(!t.isAlive()) |
| { |
| if(this.isConnected()) |
| break; |
| break; |
| } |
| } |
| if(!this.isConnected()) |
| if(t.isAlive()) |
| { |
| logger.info("Not Connected will interrupt"); |
| logger.info("Timeout expired will interrupt"); |
| t.interrupt(); |
| return false; |
| } |