From 9f13a54eb6c03b542d9d38fd24a1ed6c1d8fcee1 Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Mon, 28 Jan 2019 15:22:48 +0100 Subject: [PATCH] Remove misleading log message --- .../main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java | 4 +++- common/src/main/java/ctbrec/sites/fc2live/Fc2Model.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java index 72d9a9d8..5f9a174f 100644 --- a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java @@ -12,6 +12,7 @@ import ctbrec.sites.fc2live.Fc2Model; import ctbrec.ui.JavaFxModel; import ctbrec.ui.Player; import ctbrec.ui.TabProvider; +import ctbrec.ui.controls.Dialogs; import ctbrec.ui.sites.AbstractSiteUi; public class Fc2LiveSiteUi extends AbstractSiteUi { @@ -56,7 +57,8 @@ public class Fc2LiveSiteUi extends AbstractSiteUi { Player.play(model, false); m.closeWebsocket(); } catch (InterruptedException | IOException e) { - LOG.error("Error opening websocket connection", e); + LOG.error("Error playing the stream", e); + Dialogs.showError("Player", "Error playing the stream", e); } }).start(); return true; diff --git a/common/src/main/java/ctbrec/sites/fc2live/Fc2Model.java b/common/src/main/java/ctbrec/sites/fc2live/Fc2Model.java index 16b888ec..00dcf236 100644 --- a/common/src/main/java/ctbrec/sites/fc2live/Fc2Model.java +++ b/common/src/main/java/ctbrec/sites/fc2live/Fc2Model.java @@ -357,8 +357,10 @@ public class Fc2Model extends AbstractModel { }); synchronized (monitor) { // wait at max 10 seconds, otherwise we can assume, that the stream is not available - LOG.debug("No playlist response for 10 seconds"); - monitor.wait(TimeUnit.SECONDS.toMillis(10)); + monitor.wait(TimeUnit.SECONDS.toMillis(20)); + } + if(playlistUrl == null) { + throw new IOException("No playlist response for 20 seconds"); } } }