Commit graph

323 commits

Author SHA1 Message Date
Thulinma
98e3940079 Robustify accesses to server config 2018-11-28 11:46:33 +01:00
Thulinma
ff0b03b01a Stats fixes 2018-11-15 10:36:16 +01:00
Thulinma
7b8497603e Viewer counter fix 2018-11-13 16:51:45 +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
Thulinma
8c3178339b Controller now disables colors when stdout is no terminal, additionally disables interactive setup when stdin is no terminal. 2017-12-06 16:59:27 +01:00
Thulinma
626e688bf2 Removed newline from access log message 2017-12-06 16:59:27 +01:00
Thulinma
08dac5b2db Improved logging system 2017-12-06 16:59:27 +01:00
Thulinma
e0af7a759e Changed always-on check to getStreamStatus as opposed to streamAlive 2017-11-28 12:46:17 +01:00
Thulinma
f6f11af618 Merge branch 'development' into LTS_development 2017-11-27 11:14:58 +01:00
Thulinma
c1400fec42 Local API access debug message set to MEDIUM level 2017-11-27 11:14:51 +01:00
Thulinma
34965459aa UDP API printout debug level made higher 2017-11-27 11:13:30 +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
e1cc07c455 Added trigger capabilities. 2017-11-15 17:17:17 +01:00
Thulinma
f61e50cbd5 Added support for default responses in triggers, added maximum execution time for triggers 2017-11-15 17:17:12 +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
db410e10f4 Fixed autopush removing themselves when a new push comes in 2017-11-09 14:51:15 +01:00
Thulinma
47ed55c637 Fixed manual push corruption 2017-11-09 14:51:11 +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
601617cb51 Fixed Prometheus HTTP clean bug 2017-11-07 11:12:19 +01:00
Thulinma
11ea8b0ef2 Updater now uses HTTP downloader class 2017-11-01 19:35:21 +01:00
Thulinma
528727329b License system now uses downloader 2017-11-01 19:35:14 +01:00