Commit graph

113 commits

Author SHA1 Message Date
Thulinma
5418c1fefc Generalized Util::Config::is_restarting for rolling restarts, added rolling restart support to listening socket outputs 2019-05-23 13:30:24 +02:00
Thulinma
01d43796ad 32-bit fixes 2019-01-26 00:51:30 +01:00
Thulinma
9e1539a2b9 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_statistics.cpp
#	src/input/input_buffer.cpp
#	src/input/input_dtsc.cpp
#	src/input/input_ebml.cpp
#	src/input/input_flv.cpp
#	src/input/input_mp3.cpp
#	src/output/output_httpts.cpp
#	src/output/output_progressive_mp3.cpp
#	src/output/output_progressive_mp4.cpp
2019-01-25 23:57:42 +01:00
Thulinma
7565704fdc Fixed 32-bit compile issues 2019-01-25 23:49:56 +01:00
Thulinma
7f3b61978f Shared memory logic fix for quick disconnecting users, small tweak to sync byte reporting 2019-01-09 09:29:32 +01:00
Thulinma
8b7757c8e9 Added trigger statistics to Prometheus-style outputs, fixed executable triggers not correctly responding with the default on execv fail 2018-12-13 16:48:57 +01:00
Erik Zandvliet
10fa4b7e7b libmist backport from new metadata branch with improved typing and styling 2018-12-06 11:07:07 +01:00
Erik Zandvliet
2607113727 Library code style update + some minor backports from Pro edition 2018-12-04 13:11:48 +01:00
Thulinma
98e3940079 Robustify accesses to server config 2018-11-28 11:46:33 +01:00
Thulinma
ac92e09262 Robustify accesses to server config 2018-11-28 11:46:22 +01:00
Thulinma
ff0b03b01a Stats fixes 2018-11-15 10:36:16 +01:00
Thulinma
0707257127 Stats fixes 2018-11-15 10:36:03 +01:00
Thulinma
7b8497603e Viewer counter fix 2018-11-13 16:51:45 +01:00
Thulinma
0d9ff7da2e Viewer counter fix 2018-11-13 16:50:46 +01:00
Thulinma
b2995ea2db Fix statistics in Free edition 2018-10-15 13:43:51 +02:00
Thulinma
cdaf7920b0 Merge branch 'development' into LTS_development 2018-10-15 11:19:32 +02:00
Thulinma
dff150419b Prevent statistics going negative when going through server restarts 2018-10-15 11:19:10 +02:00
Thulinma
52b24757c9 Added support for JSONP mode and CORS headers to JSON Prometheus output 2018-07-10 09:44:50 +02:00
Thulinma
f618877a65 Merge branch 'development' into LTS_development 2018-06-27 13:52:52 +02:00
Thulinma
8ac475ca95 Fixed statistics. 😒 2018-06-27 13:51:42 +02:00
Thulinma
fc6d49ac1f Fixed race condition in prometheus output when adding new protocols 2018-06-14 15:02:11 +02:00
Thulinma
2d9e9f3c8b Replaced all instances of localtime with localtime_r 2018-05-21 09:53:12 +02:00
Thulinma
62ae2929a3 Merge branch 'newStatus' into Pro_newStatus
# Conflicts:
#	src/controller/controller_api.cpp
#	src/controller/controller_statistics.cpp
#	src/controller/controller_statistics.h
#	src/controller/controller_streams.cpp
2018-03-21 14:50:04 +01:00
Thulinma
e4ac68db54 Improved statistics and stream status 2018-03-21 14:46:22 +01:00
Thulinma
355d55decc Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_api.cpp
#	src/controller/controller_api.h
#	src/controller/controller_statistics.cpp
#	src/controller/controller_statistics.h
2018-03-20 20:15:10 +01:00
Thulinma
6e0e66076d WebSocket API in controller 2018-03-20 20:07:11 +01:00
Thulinma
0dd602d5ca WebSocket API in controller 2018-03-20 20:06:37 +01:00
Thulinma
626e688bf2 Removed newline from access log message 2017-12-06 16:59:27 +01:00
Thulinma
b9a90b134d Don't print failure to tag sessions with user agent; usually not a big deal 2017-11-27 11:12:59 +01:00
Thulinma
91262767d3 Added configMutex around connector check in Prometheus output 2017-11-15 09:48:31 +01:00
Thulinma
421b77dacd Fixed starting the controller with a locked session cache. 2017-11-14 18:17:22 +01:00
Thulinma
01ffc42f9f Stats delay for input/output can now be set separately, input delay by default 2 instead of 15. 2017-11-07 11:12:24 +01:00
Thulinma
52816a8daa Added ability to pass on URLs to load balancer 2017-10-24 14:44:06 +02:00
Thulinma
e05268f670 Load balancer now detects what streams are available on what servers, does not direct traffic if not configured 2017-10-09 15:16:37 +02:00
Thulinma
f5faa61ed4 Added bandwidth API call for bandwidth limit and exception config 2017-07-05 13:47:16 +02:00
Thulinma
f695e23ffc Fixed streams being able to go inactive multiple times in a row 2017-07-04 13:23:34 +02:00
Thulinma
01e0b76a6a Internal stream state active/inactive rewritten to use newly exposed stream status 2017-06-23 15:08:57 +02:00
Thulinma
3bad5c2161 Hopefully fixed Windows 2017-05-17 12:09:04 +02:00
Thulinma
6e21e70fae Fixed Windows builds. Wtf..? 2017-05-16 20:15:00 +02:00
Thulinma
2cec1f7836 Fixed session cache race conditions 2017-05-01 11:54:02 +02:00
Thulinma
efc80123f0 Access log compile fixes 2017-04-18 19:33:40 +02:00
Thulinma
b9f60ac92c Sessions are now wiped after the disconnect timeout, if denied access 2017-04-18 12:34:00 +02:00
Thulinma
3980b8c8c1 Access logs + made prometheus runtime changeable 2017-04-18 12:33:06 +02:00
Thulinma
e4110502ee No longer measure localhost in kernel-style measurements 2017-01-31 14:44:21 +01:00
Thulinma
0c0bb5b3bf Fixed stream statistics sometimes holding invalid values 2017-01-31 14:42:25 +01:00
Thulinma
fdb5fbad45 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/socket.cpp
#	lib/socket.h
2016-11-03 15:17:30 +01:00
Thulinma
629b24853a Added hostBytesToStr function to socket library, fixed code style, fixed UDP Cygwin support 2016-11-03 15:15:42 +01:00
Thulinma
0b78a57e40 Added shared memory session cache + instant-sync for sessions in cache. 2016-10-11 16:42:47 +02:00
Thulinma
028c485c3e Fixed stats issue for quick switching connections. 2016-10-11 16:41:42 +02:00
Thulinma
59ae4f5aca Merge branch 'development' into LTS_development 2016-10-11 16:41:15 +02:00