From e8edce5178e2ba6a7f576c689e73c1ad31a779d4 Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Thu, 18 Jun 2020 01:23:52 -0700 Subject: [PATCH 1/2] Continue to troubleshoot race condition at launch --- main.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main.go b/main.go index 915e55cd3..3dbf38566 100644 --- a/main.go +++ b/main.go @@ -37,8 +37,6 @@ func main() { usingExternalStorage = true } - resetDirectories(configuration) - if usingExternalStorage { storage.Setup(configuration) go monitorVideoContent(configuration.PrivateHLSPath, configuration, storage) @@ -46,6 +44,7 @@ func main() { go startRTMPService() + resetDirectories(configuration) startWebServer() } From 3ce6026cc8030509bd88592fcc34b50e6e828e72 Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Thu, 18 Jun 2020 01:24:09 -0700 Subject: [PATCH 2/2] Simplify videojs init --- webroot/index.html | 2 +- webroot/static/content.md | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 webroot/static/content.md diff --git a/webroot/index.html b/webroot/index.html index a1e2f75e4..e69ad8d94 100644 --- a/webroot/index.html +++ b/webroot/index.html @@ -72,7 +72,7 @@ GW TODO: playsinline muted poster="/thumbnail.png" - data-setup='{"vhs": { "enableLowInitialPlaylist": true, "smoothQualityChange": true, "handlePartialData": true }}' + data-setup='{}' > diff --git a/webroot/static/content.md b/webroot/static/content.md deleted file mode 100644 index 6b8f2888b..000000000 --- a/webroot/static/content.md +++ /dev/null @@ -1,4 +0,0 @@ -# Stream description and content can go here. - -1. Edit `content.md` in markdown. -1. And it'll go here. \ No newline at end of file