sjw/MovieNight
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
533 Commits 3 Branches 0 Tags 424 MiB
2e45392f68
Commit Graph

533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zorglube
2e45392f68 Finally found a way to correctly build on BSD, so remove BSD specific 
Makefile.
 2021-03-17 21:09:39 +01:00
Zorglube
b2eea597bd Merge branch 'viewers_stats' of 
https://github.com/zorglube/MovieNight.git into viewers_stats

Conflicts:
	handlers.go
 2021-03-16 22:48:43 +01:00
Zorglube
afc9f19e36 Count the streams using the 'http' sessions instead of the 'IP'. 2021-03-16 22:48:18 +01:00
Zorglube
5a03e809ba Count the streams using the 'http' sessions instead of the 'IP'. 2021-03-16 22:43:55 +01:00
Zorglube
bcd248ffb0 Merge branch 'viewers_stats' of https://github.com/zorglube/MovieNight into viewers_stats 2021-03-15 23:55:30 +01:00
Zorglube
6947d87f9f Stream Viewers minimal statistics. 2021-03-15 23:55:18 +01:00
Zorglube
3a4dd41f75 Stream Viewers minimal statistics. 2021-03-15 23:48:41 +01:00
Nick
9ba472bb5b
Merge pull request #154 from zorglube/master 
Update readme, FreeNAS plugin had been released
 2021-03-13 14:11:58 -05:00
Zorglube
19438a1409 Update readme, FreeNAS plugin had been released 2021-03-13 20:08:11 +01:00
Zorchenhimer
127fb4c3fa Gracefully shutdown HTTP server 
Rearranged how the RTMP and HTTP servers are started so they could be
gracefully shutdown easier.

Currently, only the HTTP server is gracefully shutdown.  I'm unsure if
it is even possible for the RTMP server.  The documentation for the RTMP
library is basically non-existent, so it's impossible to know for sure
without diving into the library code.
 2021-02-07 15:55:51 -05:00
Zorchenhimer
f76d184173 Don't hardcode emote size 
Replaced the hardcoded height attribute in the emote img tags with a
class attribute.  This allows the emotes to be resized with the change
of a CSS value instead of recompiling the server.

Resolves #150
 2021-01-16 15:36:44 -05:00
Zorchenhimer
d06e2251a4 Separate /live and / http handlers 
Separate the /live and / (main) http handlers.  This cleans up the
related code a little bit and makes it a lot easier to follow.
 2021-01-16 15:29:23 -05:00
Zorchenhimer
e051cade78 Allow the pin to be passed in via the URL 
Instead of only prompting the user for a pin, also allow it to be passed
in as the URL parameter "pin".
 2021-01-10 20:09:30 -05:00
Zorchenhimer
ebc51f938c Remove the /pin endpoint 
This was never supposed to be in there.
 2021-01-10 20:09:30 -05:00
Nick
58bd6e8a3a
Merge pull request #148 from Raz-Hemo/windows-cross-fix 
fix windows cross compiling
 2021-01-10 12:15:02 -05:00
Zorchenhimer
238d80658b Cleanup incoming stream handler 
Cleaned up the incoming RTMP handler to close connections on error.
The code aquireing the RTMP channel was also rewritten to be more
idomatic and easier to follow.
 2021-01-10 12:04:16 -05:00
Nick
b3b9255ea0
Merge pull request #147 from Bruno-DaSilva/master 
Add unlocks to error cases in handlers::handlePublish()
 2021-01-10 11:46:31 -05:00
Raz Hemo
faa0792e9c fix windows cross compiling 2021-01-08 11:42:40 +02:00
Bruno-DaSilva
ded51b2b20
Add unlocks to error cases in handlers::handlePublish() 
In handlers::handlePublish(), the mutex for the rtmp stream is locked at the beginning of the function. The previous implementation checked for error cases (e.g. incorrect stream key), logging and immediately returning if an error case was found. The mutex, however, was not unlocked, leading to the server effectively 'freezing' as other interactions try and lock that mutex. 
This MR adds mutex unlocks in each error case to ensure that the server continues to function in the event of a recoverable error.
 2020-12-01 21:23:41 -08:00
Nick
9da46087e1
Merge pull request #144 from zorglube/master 
Templated the chat messages.
 2020-11-14 12:39:15 -05:00
Zorglube
0fa99f7ab4 Templated the chat messages. 2020-11-11 20:51:29 +01:00
Zorchenhimer
e26ae33758 Fix building on non-windows machines 
Don't default to windows if GOOS is not set.  Likewise, don't default to
386 if GOARCH isn't set.  Go will use the system's default values, or
any values set before running `make`.
 2020-11-04 23:20:15 -05:00
Zorchenhimer
a840f80f9a Fix make recipe for wasm_exec.js file 
Add GO_VERSION to the command that copies the wasm_exec.js file so it
will look in the correct folder when using an alternate version of Go.
 2020-11-04 22:59:01 -05:00
Nick
15f790ae56
Merge pull request #141 from zorglube/master 
Run from anywhere, build for different ARCH (Third time)
 2020-11-03 20:14:00 -05:00
Zorglube
a0b3e856c2 revert common/chatdata.go 2020-11-02 12:45:15 +01:00
Zorglube
8260e9c9df zorchenhimer PR comment 2020-11-02 12:41:34 +01:00
Bertrand Moreau
2d1cd12fc0 Chat template 2020-10-26 14:27:14 +01:00
Zorglube
7349628293 setting.go: 
- Leave the position of the log file free
 2020-10-24 01:08:57 +02:00
Zorglube
6b7e6cd083 Fixed the Emotes feature 2020-10-20 20:57:05 +02:00
Zorglube
c8fa4746ce Merge branch 'master' of https://github.com/zorglube/MovieNight into master 2020-10-20 01:10:32 +02:00
Zorglube
0ecc199621 Makefile.common: fix stupid mistake 2020-10-20 01:09:31 +02:00
Zorglube
3a61dc6948 MakeFile: typo 2020-10-20 01:09:31 +02:00
Bertrand Moreau
ebb0d7bdc2 Crossplatform make 
Work in progress 50%
 2020-10-20 01:09:31 +02:00
Bertrand Moreau
be67c27355 Typo + cross-compile arch 2020-10-20 01:09:31 +02:00
Zorglube
223fabf53a Create MakeFile.BSD 2020-10-20 01:09:28 +02:00
Zorglube
4e9741fa6e Add DSB into builds 2020-10-20 01:07:43 +02:00
Bertrand Moreau
87d2d201ec Removed: if windows 
It isn't mandatory to be suffixed by ".exe" to be runnable into an
windows.
 2020-10-20 01:01:58 +02:00
Bertrand Moreau
516b9a212b Run from anywhere 
Get the runpath at runtime, in order to run MovieNight from whatever
position into the filesystem.
 2020-10-20 01:01:55 +02:00
Zorglube
b3dc13affb Relative running 2020-10-20 00:59:57 +02:00
Zorglube
8c7a303e14 absolut dir 2020-10-20 00:56:52 +02:00
Zorglube
304e4751e2 Relative dir 2020-10-20 00:56:47 +02:00
Zorglube
a8d1019dc0 BSD Make if 2020-10-20 00:53:14 +02:00
Zorglube
3b3ec278a6 Update .travis.yml 2020-10-20 00:53:13 +02:00
Zorglube
bdc4adc5a6 Update .travis.yml 2020-10-20 00:53:13 +02:00
Bertrand Moreau
7ff584504c remove Clever Could conf 2020-10-20 00:53:13 +02:00
Bertrand Moreau
73d0731849 Remove git workflow 2020-10-20 00:53:13 +02:00
Bertrand Moreau
aa666a1bbb Remove release 2020-10-20 00:53:13 +02:00
Zorglube
0e4b8db4c1 Release update 2020-10-20 00:53:13 +02:00
Zorglube
e37a5271ce Release FreeBSD 2020-10-20 00:53:13 +02:00
Zorglube
8ce5687e01 GitHub CI/CD 2020-10-20 00:53:13 +02:00