j62
/
ctbrec
2
2
Fork 2
Code Issues 4 Pull Requests Packages Projects Releases 3 Wiki Activity

Improved logging

This commit is contained in:
0xboobface 2018-08-09 19:38:55 +02:00
parent 21524e4b8b
commit f485d3255d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/ctbrec/recorder/download/HlsDownload.java
View File

@ -1,5 +1,6 @@
package ctbrec.recorder.download; package ctbrec.recorder.download;
import java.io.EOFException;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@ -128,6 +129,9 @@ public class HlsDownload implements Download {
throw new IOException("Couldn't parse stream information", e); throw new IOException("Couldn't parse stream information", e);
} catch(PlaylistException e) { } catch(PlaylistException e) {
throw new IOException("Couldn't parse HLS playlist", e); throw new IOException("Couldn't parse HLS playlist", e);
} catch(EOFException e) {
// end of playlist reached
LOG.debug("Reached end of playlist for model {}", model);
} catch(Exception e) { } catch(Exception e) {
throw new IOException("Couldn't download segment", e); throw new IOException("Couldn't download segment", e);
} finally { } finally {
@ -228,7 +232,8 @@ public class HlsDownload implements Download {
@Override @Override
public Boolean call() throws Exception { public Boolean call() throws Exception {
LOG.trace("Downloading segment to " + file); LOG.trace("Downloading segment to " + file);
for (int i = 0; i < 3; i++) { int maxTries = 3;
for (int i = 1; i <= maxTries; i++) {
Request request = new Request.Builder().url(url).addHeader("connection", "keep-alive").build(); Request request = new Request.Builder().url(url).addHeader("connection", "keep-alive").build();
Response response = client.execute(request); Response response = client.execute(request);
try ( try (
@ -245,7 +250,11 @@ public class HlsDownload implements Download {
LOG.debug("Segment does not exist {}", url.getFile()); LOG.debug("Segment does not exist {}", url.getFile());
break; break;
} catch(Exception e) { } catch(Exception e) {
LOG.error("Error while downloading segment. Retrying " + i, e); if (i == maxTries) {
LOG.warn("Error while downloading segment. Segment finally {} failed", file.toFile().getName());
} else {
LOG.warn("Error while downloading segment on try {}", i);
}
} finally { } finally {
response.close(); response.close();
} }