Commit graph

130 commits

Author SHA1 Message Date
Thulinma
101a8d521c Fixed debug level being null when unset 2017-05-09 15:48:05 +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
11f95a64fe Improved console interface 2017-03-29 12:05:42 +02:00
Thulinma
831e454ebb Improved console interface 2017-03-29 12:03:15 +02:00
Thulinma
370418631c Improved controller shutdown speed 2017-01-02 12:17:17 +01:00
Thulinma
bd6034828f Merge branch 'development' into LTS_development
# Conflicts:
#	CMakeLists.txt
#	src/controller/controller_connectors.cpp
2017-01-02 12:14:16 +01:00
Thulinma
0ece6d8f26 Added ability for controller to restart without restarting connectors simultaneously 2017-01-02 12:11:05 +01:00
Thulinma
c316fe4e0b Merge branch 'development' into LTS_development 2016-10-10 15:08:08 +02:00
Thulinma
bbcf178e7f Fixed reboot loop when aborting startup. 2016-10-10 15:08:01 +02: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
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
f641989991 Added maxconnsperip setting to controller. Only enforced if USER_NEW trigger is in use. 2016-05-16 16:48:21 +02:00
Thulinma
34df78ce0b Implemented auto-re-push behaviour. 2016-05-12 14:49:19 +02:00
Balder
ed773e1a19 Added stuck MstConfLock semaphore recovery on boot by jaron. 2016-05-09 12:11:35 +02:00
Thulinma
1f5dfdc580 Converted argument style to new singular method. 2016-05-04 16:51:16 +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
dd46788d37 Support for text-based prometheus-compatible instrumentation. 2016-04-22 16:17:28 +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
eb6b98b219 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller.cpp
2015-10-14 10:38:59 +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
74c8932106 Merge branch 'development' into json_mod_LTS
# Conflicts:
#	lib/shared_memory.cpp
#	src/controller/controller.cpp
#	src/io.cpp
#	src/output/output.cpp
#	src/output/output_http_internal.cpp
2015-10-07 11:05:49 +02:00
Thulinma
16d38459b6 Made JSON library non-recursive.
Co-authored with Diederick.
2015-10-06 13:21:14 +02:00
Thulinma
d8051984f2 Merge branch 'development' into LTS_development 2015-09-03 17:55:47 +02:00
Thulinma
096b289cdf Updated --version argument to give more detailed output. 2015-09-03 17:54:20 +02:00
Thulinma
d6922c92f5 Merge branch 'development' into LTS_development 2015-08-28 21:58:43 +02:00
Thulinma
71dc32d2d3 Added ability to break through semaphore locks to the controller monitoring thread. 2015-08-28 21:56:27 +02:00
Thulinma
cd74fd1e46 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller.cpp
2015-06-18 16:07:30 +02:00
Thulinma
eaabf9e800 Fixed errors when requesting short URLs, fixed race condition during shutdown of controller. 2015-06-18 16:06:35 +02:00
Thulinma
c04572f685 Removed logs from controller config file. 2015-06-16 11:17:39 +02:00
Thulinma
4bdbd82f66 LTS Commits 2015-04-05 21:38:36 +02:00
Thulinma
da612d03b6 Simplified controller config parsing - behaviour unchanged. 2014-12-15 18:14:00 +01:00
Thulinma
74d491d3ff Added small timer before closing stderr to make sure all closing messages are properly printed. 2014-11-29 01:12:01 +01:00
Thulinma
4e705195a8 Fixed logging thread safety issues. 2014-09-07 22:59:37 +02:00
ozzay
f22c229aea Fixed daemonizing bug 2014-08-18 13:09:49 +02:00
Thulinma
507eb80707 Temporarily disabled conversion API. 2014-08-05 21:52:52 +02:00
Thulinma
2c972c0829 Fixed 5s timer for protocol status checker. 2014-08-04 16:00:37 +02:00
Thulinma
5264fbf546 MistController: now with even more threads! 2014-08-02 16:39:43 +02:00
Thulinma
848f075ff4 Added lots of DLVL_INSANE level debug messages to controller metadata checks. Simplified internal stream handling. 2014-07-29 13:36:43 +02:00
Thulinma
1e66e6c817 Removed stats sockets - haven't been in use for a while now. 2014-07-09 14:58:55 +02:00
Thulinma
5a6e793f78 Removed faulty basepath default setting. 2014-06-23 21:49:28 +02:00
Thulinma
840cfaabed Added support for arrays of requests in totals/clients API calls. 2014-06-11 17:58:49 +02:00
Thulinma
4f217771f0 Tweaked debug messages of controller when changing debug level. 2014-06-05 16:43:29 +02:00
Thulinma
17d90f05a9 Tweaks to various debug messages. 2014-06-05 14:21:32 +02:00