Merge branch 'master' into 0614gw-updates

This commit is contained in:
Ginger Wong 2020-06-14 18:20:24 -07:00
commit 1b2b7248fc
3 changed files with 9 additions and 4 deletions

View file

@ -30,7 +30,7 @@ type Stats struct {
func (s *Stats) Setup() {
s.clients = make(map[string]time.Time)
statsSaveTimer := time.NewTicker(2 * time.Minute)
statsSaveTimer := time.NewTicker(1 * time.Minute)
go func() {
for {
select {
@ -40,7 +40,7 @@ func (s *Stats) Setup() {
}
}()
staleViewerPurgeTimer := time.NewTicker(5 * time.Second)
staleViewerPurgeTimer := time.NewTicker(3 * time.Second)
go func() {
for {
select {

View file

@ -15,6 +15,10 @@
<script src="vendor/autolink.js"></script>
<link href="./styles/layout.css" rel="stylesheet" />
<link
href="https://unpkg.com/@videojs/themes@1/dist/sea/index.css"
rel="stylesheet"
/>
</head>
<body>
@ -53,11 +57,12 @@
<div id="video-container" class="flex shadow-md owncast-video-container">
<video
class="video-js"
class="video-js vjs-theme-sea"
id="video"
preload="auto"
controls
autoplay
playsinline
muted
poster="https://goth.land/thumbnail.png"
data-setup='{}'

View file

@ -100,5 +100,5 @@ function setupWebsocket() {
setupApp()
getStatus()
setupWebsocket()
// setInterval(getStatus, 5000)
setInterval(getStatus, 5000)