Commit graph

78 commits

Author SHA1 Message Date
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
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
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
b35d56cd8f Added ability to override internal UDP API bound host/port 2018-10-07 16:06:20 +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
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
7af419fdad Added "deletestreamsource" call that deletes a stream AND the corresponding source file. 2018-05-09 13:39:53 +02:00
Thulinma
e4ac68db54 Improved statistics and stream status 2018-03-21 14:46:22 +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
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
601617cb51 Fixed Prometheus HTTP clean bug 2017-11-07 11:12:19 +01:00
Thulinma
da37a33d47 Fixed API calls not taking immediate effect, fixed UDP API not locking config 2017-07-25 16:52:27 +02:00
Thulinma
f5faa61ed4 Added bandwidth API call for bandwidth limit and exception config 2017-07-05 13:47:16 +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
afff9c6079 No longer leave UDP socket open in spawned children from Controller 2017-05-25 12:15:00 +02:00
Thulinma
0181a86901 Merge branch 'development' into LTS_development 2017-05-15 17:15:50 +02:00
Thulinma
38bbadb731 Updated API to force account creation through LSP when no accounts present 2017-05-15 17:15:36 +02:00
Thulinma
0798a6c712 Fixes for triggers 2017-05-13 15:18:21 +02:00
Thulinma
bf382cbea0 Updated updater. Yes, the irony is not lost on me. 2017-05-11 14:03:01 +02:00
Thulinma
0eca65e433 Merge branch 'development' into LTS_development 2017-05-09 16:23:23 +02:00
Thulinma
101a8d521c Fixed debug level being null when unset 2017-05-09 15:48:05 +02:00
Thulinma
4f1e653c44 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_streams.cpp
2017-05-09 13:27:07 +02:00
Thulinma
0e0da824f7 Robustified stream/protocol related API calls 2017-05-09 11:31:24 +02:00
Thulinma
85202a0b30 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller.cpp
#	src/controller/controller_storage.cpp
#	src/controller/controller_storage.h
2017-05-08 16:10:48 +02:00
Thulinma
04e0dfeab0 Added instance ID 2017-05-08 15:56:58 +02:00
Thulinma
4bdcb24132 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_api.cpp
#	src/controller/controller_api.h
#	src/controller/controller_storage.cpp
2017-05-08 10:23:54 +02:00
Thulinma
16637b3138 Backported many Pro API calls to OS edition, improved storage method of config file 2017-05-08 10:20:41 +02:00
Thulinma
d0912c9d00 Controller now listens locally to UDP port 4242 for API commands, added always-minimal api2 request type. 2017-04-18 12:33:49 +02:00
Thulinma
3980b8c8c1 Access logs + made prometheus runtime changeable 2017-04-18 12:33:06 +02:00
Thulinma
7629b00a4c Merge branch 'development' into LTS_development 2017-04-18 12:32:39 +02:00
Thulinma
a82be2775f Added local-only auto-authorize for API 2017-04-18 12:20:20 +02:00
Thulinma
6254c285d6 Added duplicate checking for manual pushes 2016-11-18 15:35:15 +01:00
Thulinma
3f14db4b12 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
#	src/output/output.cpp
2016-11-14 11:29:24 +01:00
Thulinma
0e649b7c72 Fixed creating accounts on wrong login attempt 2016-11-14 10:53:07 +01:00
Thulinma
2062d83858 New licensing system
By Wouter Spruit and Balder Viëtor with minor edits by me
2016-09-27 13:43:53 +02:00
Thulinma
d504324b8f Added stop_sessions API call 2016-09-22 09:52:08 +02:00
Thulinma
4c9c6fa7ba Backported various little edits from Pro edition. 2016-06-02 14:07:21 +02:00
Thulinma
5759dbef0f Added "invalidate_sessions" API call, made USER_NEW trigger even more atomic. 2016-05-20 13:06:37 +02:00
Thulinma
34df78ce0b Implemented auto-re-push behaviour. 2016-05-12 14:49:19 +02:00