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

441 commits

Author SHA1 Message Date
Thulinma
7565704fdc Fixed 32-bit compile issues 2019-01-25 23:49:56 +01:00
Thulinma
9d58019449 Merge branch 'development' into LTS_development 2019-01-25 22:05:35 +01:00
Thulinma
9671e385ce Added stream name to logs over websocket API 2019-01-25 22:04:26 +01:00
Thulinma
e3e5b39a62 Merge branch 'development' into LTS_development 2019-01-24 14:41:03 +01:00
Thulinma
b2c9cc2c1b Added stream name to logs API call responses 2019-01-24 14:40:56 +01:00
Thulinma
d82fc394e1 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/controller/controller_api.cpp
 2019-01-16 15:53:57 +01:00
Thulinma
14889fa35b Added release string to API version response 2019-01-16 15:49:08 +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
d36a9664f7 Fixed incorrect stream specific flag for RTMP_PUSH_REWRITE trigger capabilties 2018-12-14 16:44:37 +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
Thulinma
ca755039e1 Only re-write trigger pages if trigger configuration has changed 2018-12-09 21:45:04 +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
83665c4e3b Merge branch 'development' into LTS_development 2018-11-28 11:55:15 +01:00
Thulinma
3cb03392e1 Added stream name to logging 2018-11-28 11:55:08 +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
6a5549444b Merge branch 'development' into LTS_development 
# Conflicts:
#	src/input/input_buffer.cpp
#	src/output/output_ts_base.cpp
 2018-11-01 16:37:03 +01:00
Thulinma
24006648f9 Cleaned up, fixed and robustified semaphore and signal related code 2018-11-01 16:11:47 +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
b35d56cd8f Added ability to override internal UDP API bound host/port 2018-10-07 16:06:20 +02:00
Thulinma
c20e1ad9eb Added human readable name to license callbacks 2018-07-27 17:20:09 +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
8c2360fd56 Replaced all instances of localtime with localtime_r 2018-05-21 09:54:05 +02:00
Thulinma
2d9e9f3c8b Replaced all instances of localtime with localtime_r 2018-05-21 09:53:12 +02:00
Thulinma
93f8b01a0b Added USER_END trigger 2018-05-18 17:20:42 +02:00
Thulinma
96563c0971 Fix for triggers 2018-05-16 11:12:08 +02:00
Thulinma
7af419fdad Added "deletestreamsource" call that deletes a stream AND the corresponding source file. 2018-05-09 13:39:53 +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
2443fcff92 Added new API JSON-based auth scheme 
# Conflicts:
#	src/controller/controller_api.cpp
 2018-03-20 14:58:06 +01:00
Thulinma
d3d93eb4da Merge branch 'development' into LTS_development 
# Conflicts:
#	src/controller/controller_api.cpp
 2018-03-20 14:56:49 +01:00
Thulinma
f126b17ed1 Added new API JSON-based auth scheme 2018-03-20 14:54:51 +01:00
Thulinma
1467fda3ec Merge branch 'development' into LTS_development 2018-01-30 16:05:58 +01:00
Thulinma
fd60a6b8d3 Fix Windows builds 2018-01-30 16:05:50 +01:00
Thulinma
ca19feed7f Merge branch 'development' into LTS_development 
# Conflicts:
#	src/controller/controller_storage.cpp
 2017-12-08 19:54:44 +01:00
Thulinma
26d039f278 Controller now disables colors when stdout is no terminal, additionally disables interactive setup when stdin is no terminal. 2017-12-08 19:48:49 +01:00
Thulinma
304426c2c6 Improved logging system 2017-12-08 19:48:49 +01:00