Commit graph

64 commits

Author SHA1 Message Date
Thulinma
6e0e66076d WebSocket API in controller 2018-03-20 20:07:11 +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
Thulinma
b9f6107528 Implemented push setting storage. 2016-05-12 14:49:19 +02:00
Thulinma
263dee7b25 Added push-related API calls to controller, made outputs able to wait for playable streams. 2016-05-11 13:55:23 +02:00
Thulinma
a17b03b3a3 Removed basepath setting from API handler. 2016-05-04 23:21:40 +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
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
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
bf180a2a35 Added "minimal" API request for requesting minimal responses only. 2015-11-27 10:44:21 +01:00
Thulinma
8fb8a98c5f Pro side of JSON library updates. 2015-10-07 11:06:22 +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
d8051984f2 Merge branch 'development' into LTS_development 2015-09-03 17:55:47 +02:00