0

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

View File

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

View File

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