hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5215 commits 3 branches 0 tags 29 MiB
Commit graph

458 commits

Author SHA1 Message Date
Thulinma
a17b03b3a3 Removed basepath setting from API handler. 2016-05-04 23:21:40 +02:00
Thulinma
561a0eca57 Controller fixes. 2016-05-04 18:07:20 +02:00
Thulinma
1f5dfdc580 Converted argument style to new singular method. 2016-05-04 16:51:16 +02:00
Thulinma
df16c815c2 Semaphore fixes. 2016-05-03 16:34:19 +02:00
Thulinma
9498f87cc3 Fixed Prometheus socket getting disconnected after each request. 2016-05-03 15:12:40 +02:00
Thulinma
f4b296164e Fixed all semaphore instances not being cleaned up properly. 2016-05-03 12:13:58 +02:00
Thulinma
9e8b07cbfc Added STATS_DELAY compile flag for overriding the statistics delay for better or worse accuracy than the default. 2016-04-27 12:49:25 +02:00
Thulinma
36d8986f4b Added CPU and memory stats to instrumentation outputs. 2016-04-26 16:18:43 +02:00
Thulinma
b6d879369f Added JSON instrumentation output. 2016-04-22 16:17:28 +02:00
Thulinma
dd46788d37 Support for text-based prometheus-compatible instrumentation. 2016-04-22 16:17:28 +02:00
Thulinma
0a8b8e40d8 Merge branch 'development' into LTS_development 2016-04-15 13:47:42 +02:00
Thulinma
9239586a89 Added cpu_use response to capabilities API call 2016-04-15 13:47:35 +02:00
Thulinma
a3a40dbf17 Fix stats not disappearing 2016-04-14 16:32:17 +02:00
Thulinma
c548077282 Made fillActive calls (stats_streams and current_streams) only count users that have retrieved at least 128KiB of data, in order to filter out index and meta requests. 2016-04-14 12:39:20 +02:00
Thulinma
230772f125 fillActive now 15 seconds delayed as opposed to 2 seconds delayed, for more accurate viewer counts. 2016-04-13 15:20:23 +02:00
Balder
b8054a5200 Added header to enforce newest compatability for IE browsers. They misbehave on intranet addressess otherwise 2016-04-06 10:11:12 +02:00
Thulinma
2029b35361 Tweaked fillActive to have both now and historic modes 
Made streams no longer show as active for ~10m after being active.
 2016-02-29 13:25:19 +01:00
Thulinma
99b5b8361d Merge branch 'development' into LTS_development 2016-02-29 13:20:52 +01:00
Thulinma
77a6315dfb Wipe sessions when they expire. 2016-02-29 13:16:58 +01:00
Thulinma
f6e2e95b5a Added USER_NEW trigger. 2016-02-19 11:33:40 +01:00
Thulinma
463e549b4d Fixed naming bug when adding new streams 2016-02-16 09:18:02 +01:00
Erik Zandvliet
c25a533729 Recording, HLS Push, UDP (Multicast) Input, Threaded TS 2016-02-12 16:30:33 +01:00
Thulinma
bf180a2a35 Added "minimal" API request for requesting minimal responses only. 2015-11-27 10:44:21 +01:00
Thulinma
22467d603e Added support for clients and lastms requests in active_streams API call 2015-11-27 10:44:21 +01:00
Thulinma
279add438a Implemented triggers. 
Merged from code by Wouter Spruit, with additions by yours truly.
 2015-10-14 10:48:00 +02:00
Thulinma
eb6b98b219 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/controller/controller.cpp
 2015-10-14 10:38:59 +02:00
Thulinma
3ba11441a1 Improved flow of controller main function, made config file only re-write if updates were actually necessary, failure to open a stream input now fails the output correctly. 2015-10-14 10:25:58 +02:00
Thulinma
330117b1f4 Merge branch 'development' into LTS_development 2015-10-13 15:34:58 +02:00
Thulinma
2f4a4660d0 Fixed controller breaking when all connectors are deleted simultaneously. 2015-10-13 15:34:24 +02:00
Thulinma
21ce93f520 Haha. 2015-10-13 12:47:07 +02:00
Thulinma
8fb8a98c5f Pro side of JSON library updates. 2015-10-07 11:06:22 +02:00
Thulinma
74c8932106 Merge branch 'development' into json_mod_LTS 
# Conflicts:
#	lib/shared_memory.cpp
#	src/controller/controller.cpp
#	src/io.cpp
#	src/output/output.cpp
#	src/output/output_http_internal.cpp
 2015-10-07 11:05:49 +02:00
Thulinma
16d38459b6 Made JSON library non-recursive. 
Co-authored with Diederick.
 2015-10-06 13:21:14 +02:00
Thulinma
c9a30c2816 Improved on/off display for streams. 2015-09-29 11:03:26 +02:00
Erik Zandvliet
1f4b523b1b Initial TS Input commit 2015-09-10 00:54:55 +02:00
Thulinma
10f0f6bb92 addstream/deletestream requests now no longer send a complete stream list as reply, but instead an incomplete stream list. 2015-09-08 22:42:54 +02:00
Thulinma
c8d1c2006e Pro version equivalent of recent free version changes. 2015-09-03 19:56:27 +02:00
Thulinma
d8051984f2 Merge branch 'development' into LTS_development 2015-09-03 17:55:47 +02:00
Thulinma
096b289cdf Updated --version argument to give more detailed output. 2015-09-03 17:54:20 +02:00
Thulinma
d6922c92f5 Merge branch 'development' into LTS_development 2015-08-28 21:58:43 +02:00
Thulinma
71dc32d2d3 Added ability to break through semaphore locks to the controller monitoring thread. 2015-08-28 21:56:27 +02:00
Thulinma
32cdf623b4 Changes to controller functioning. 2015-08-28 21:45:25 +02:00
Thulinma
cd74fd1e46 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/controller/controller.cpp
 2015-06-18 16:07:30 +02:00
Thulinma
eaabf9e800 Fixed errors when requesting short URLs, fixed race condition during shutdown of controller. 2015-06-18 16:06:35 +02:00
Thulinma
a3354aeee6 Removed metadata parsing from controller for better stability and faster stream handling. 
# Conflicts:
#	src/controller/controller_streams.cpp
 2015-06-16 13:18:16 +02:00
Thulinma
036178f780 Removed metadata parsing from controller for better stability and faster stream handling. 2015-06-16 11:18:00 +02:00
Thulinma
c04572f685 Removed logs from controller config file. 2015-06-16 11:17:39 +02:00
Thulinma
e0c9173f9a Merge branch 'development' into LTS_development 2015-05-12 11:23:08 +02:00
Thulinma
a3bf393bea Added generic CORS header adder, now used in controller, HLS output and internal HTTP handler. 2015-05-12 11:23:00 +02:00
Thulinma
721e9dfd05 Merge branch 'development' into LTS_development 2015-04-16 13:19:01 +02:00