From b37178170b8a04e171ab765aa9f1ade5e172605f Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Sun, 29 Dec 2019 20:50:34 +0100 Subject: [PATCH] Improve logging --- .../ctbrec/recorder/NextGenLocalRecorder.java | 2 +- .../download/hls/AbstractHlsDownload.java | 2 +- .../recorder/download/hls/HlsDownload.java | 16 ++++++++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java b/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java index 38f99178..b3b4fe48 100644 --- a/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java +++ b/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java @@ -241,7 +241,7 @@ public class NextGenLocalRecorder implements Recorder { return; } - LOG.debug("Starting recording for model {}", model.getName()); + LOG.info("Starting recording for model {}", model.getName()); Download download = model.createDownload(); download.init(config, model, Instant.now()); Objects.requireNonNull(download.getStartTime(), diff --git a/common/src/main/java/ctbrec/recorder/download/hls/AbstractHlsDownload.java b/common/src/main/java/ctbrec/recorder/download/hls/AbstractHlsDownload.java index b65d8c39..073ca965 100644 --- a/common/src/main/java/ctbrec/recorder/download/hls/AbstractHlsDownload.java +++ b/common/src/main/java/ctbrec/recorder/download/hls/AbstractHlsDownload.java @@ -125,7 +125,7 @@ public abstract class AbstractHlsDownload extends AbstractDownload { throw new InvalidPlaylistException("Playlist has no media playlist"); } else { // update playlist url in case the streaming server has switched or something - LOG.debug("Loading segment playlist failed - trying to get a playlist URL"); + LOG.debug("Loading segment playlist failed - trying to get a fresh playlist URL"); segmentsURL = getSegmentPlaylistUrl(getModel()); throw new HttpException(response.code(), response.message()); } diff --git a/common/src/main/java/ctbrec/recorder/download/hls/HlsDownload.java b/common/src/main/java/ctbrec/recorder/download/hls/HlsDownload.java index 99323dac..9630e599 100644 --- a/common/src/main/java/ctbrec/recorder/download/hls/HlsDownload.java +++ b/common/src/main/java/ctbrec/recorder/download/hls/HlsDownload.java @@ -154,10 +154,22 @@ public class HlsDownload extends AbstractHlsDownload { LOG.debug("Reached end of playlist for model {}", model); } catch (HttpException e) { if (e.getResponseCode() == 404) { - LOG.debug("Playlist not found (404). Model {} probably went offline", model); + ctbrec.Model.State modelState; + try { + modelState = model.getOnlineState(false); + } catch (ExecutionException e1) { + modelState = ctbrec.Model.State.UNKNOWN; + } + LOG.info("Playlist not found (404). Model {} probably went offline. Model state: {}", model, modelState); waitSomeTime(10_000); } else if (e.getResponseCode() == 403) { - LOG.debug("Playlist access forbidden (403). Model {} probably went private or offline", model); + ctbrec.Model.State modelState; + try { + modelState = model.getOnlineState(false); + } catch (ExecutionException e1) { + modelState = ctbrec.Model.State.UNKNOWN; + } + LOG.info("Playlist access forbidden (403). Model {} probably went private or offline. Model state: {}", model, modelState); waitSomeTime(10_000); } else { throw e;