Commit graph

11 commits

Author SHA1 Message Date
Thulinma
1172768c34 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/shared_memory.cpp
#	src/controller/controller.cpp
#	src/controller/controller_storage.h
#	src/output/output.cpp
2016-09-15 16:17:06 +02:00
Thulinma
ceafaa57e6 Added angel process 2016-09-15 16:03:24 +02:00
Thulinma
4c9c6fa7ba Backported various little edits from Pro edition. 2016-06-02 14:07:21 +02:00
Thulinma
dfc41cc596 Prometheus stats split over viewers, incoming and outgoing.
Load balancer updated to use new split stats and provide info per host and/or stream if requested over its port.
2016-05-15 00:20:53 +02:00
Thulinma
df16c815c2 Semaphore fixes. 2016-05-03 16:34:19 +02:00
Thulinma
8542281ac2 JSON-based input selection. 2014-10-02 16:12:19 +02:00
Thulinma
5264fbf546 MistController: now with even more threads! 2014-08-02 16:39:43 +02:00
Thulinma
1174773244 Finalized error propagation and debug level setting code. 2014-06-05 09:55:30 +02:00
Thulinma
3810330343 Added debug level options. 2014-05-29 13:26:16 +02:00
Erik Zandvliet
18fa38a5cc Added error detection on writing config file 2014-01-13 15:24:27 +01:00
Thulinma
1762ae9724 Made src directory structure more sane - all binaries are now built in src but sources are divided amongst subdirs of src 2013-03-13 23:28:47 +01:00
Renamed from src/controller_storage.h (Browse further)