Commit graph

25 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
9ff8be341c Merge branch 'development' into LTS_development 2016-07-20 14:57:30 +02:00
Thulinma
a9dffb9438 Added check for invalid handle to config storage 2016-07-20 14:56:04 +02:00
Thulinma
4c9c6fa7ba Backported various little edits from Pro edition. 2016-06-02 14:07:21 +02:00
Thulinma
69eea675eb Fixed push-out shutting down the logger, added debug message for logger exiting. 2016-05-23 16:59:39 +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
f4b296164e Fixed all semaphore instances not being cleaned up properly. 2016-05-03 12:13:58 +02:00
Thulinma
279add438a Implemented triggers.
Merged from code by Wouter Spruit, with additions by yours truly.
2015-10-14 10:48:00 +02:00
Thulinma
3ba11441a1 Improved flow of controller main function, made config file only re-write if updates were actually necessary, failure to open a stream input now fails the output correctly. 2015-10-14 10:25:58 +02:00
Thulinma
a9a7ff7202 Tweaked debug message verbosity. 2015-04-02 16:32:08 +02:00
Thulinma
43d35cf29b Converted previously hardcoded default sizes for shared memory pages to defines. 2015-01-27 12:03:52 +01:00
Thulinma
142ef73f6c Various fixes for live streams. 2014-12-21 13:50:08 +01: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
28db5700a4 Edited some logging details. 2014-01-22 13:49:53 +01:00
Erik Zandvliet
e09be154bc Added timestamps to console log 2014-01-22 08:54:47 +01:00
Erik Zandvliet
18fa38a5cc Added error detection on writing config file 2014-01-13 15:24:27 +01:00
Thulinma
8cae22be8e Reduced log duplicity. 2013-10-29 16:52:05 +01:00
Erik Zandvliet
96e8523c51 Fixed a small bug in logging 2013-05-13 13:13:57 +02:00
Erik Zandvliet
ea646f6354 Added doxygen-style documentation to the controller. 2013-03-28 16:14:13 +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.cpp (Browse further)