Commit graph

323 commits

Author SHA1 Message Date
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
23550232b9 Fixed compile error 2016-11-21 09:59:51 +01:00
Thulinma
781cad41c8 Added auto-recovery of push list on crash and/or restart 2016-11-18 15:35:21 +01: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
fdb5fbad45 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/socket.cpp
#	lib/socket.h
2016-11-03 15:17:30 +01:00
Thulinma
629b24853a Added hostBytesToStr function to socket library, fixed code style, fixed UDP Cygwin support 2016-11-03 15:15:42 +01:00
Thulinma
df4a71719d Removed extra newline from STREAM_READY trigger, removed superfluous log message. 2016-11-03 12:01:17 +01:00
Thulinma
0b78a57e40 Added shared memory session cache + instant-sync for sessions in cache. 2016-10-11 16:42:47 +02:00
Thulinma
028c485c3e Fixed stats issue for quick switching connections. 2016-10-11 16:41:42 +02:00
Thulinma
59ae4f5aca Merge branch 'development' into LTS_development 2016-10-11 16:41:15 +02:00
Thulinma
8f6d75e51e Fixed stats issue for quick switching connections. 2016-10-11 16:36:22 +02:00
Thulinma
e10a22503d Added per-output statistics 2016-10-11 15:19:14 +02: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
d504324b8f Added stop_sessions API call 2016-09-22 09:52:08 +02:00
Thulinma
69bb08a10a MistInTS now shuts down after 20 seconds of no data 2016-09-22 09:51:48 +02:00
Thulinma
172bdabf36 New style of always-on inputs. Still needs interface updates 2016-09-22 09:51:21 +02:00
Thulinma
eccd3d2949 Merged MistInTS and MistInTSStream, added support for streamed file input through stream:// source 2016-09-22 09:51:13 +02:00
Thulinma
497583e54b Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_statistics.cpp
2016-09-22 09:16:34 +02:00
Thulinma
26f4b2efd9 Stats pages are now left behind unclean on purpose on updating/restarting the controller, to preserve stats across restarts 2016-09-22 09:14:03 +02:00
Thulinma
6e7d2c2d4a Removed GeoIP support fully 2016-09-15 16:18:21 +02:00
Thulinma
07eada311a Tweaked stats debugging messages verbosity 2016-09-15 16:18:16 +02:00
Thulinma
0fe940fa77 Pro side of edits to explicit finishEach 2016-09-15 16:18:00 +02:00
Thulinma
b92829956e Added secondary BW stats from kernel, as more reliable alternative for now. 2016-09-15 16:17:54 +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
a16479b3c0 Merge branch 'development' into LTS_development 2016-08-02 17:12:13 +02:00
Thulinma
09fbe27651 Fixed segmentation fault when no connectors installed 2016-08-02 17:12:00 +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
6babfe64c6 Fixed bandwidth sometimes being wrongly measured. 2016-06-09 18:43:16 +02:00
Thulinma
ed982b9eb3 Added/tweaked debug messages for stats 2016-06-09 18:42:32 +02:00
Thulinma
4c9c6fa7ba Backported various little edits from Pro edition. 2016-06-02 14:07:21 +02:00
Thulinma
d048aaccc4 Forwardported some free version changes to Pro. 2016-05-30 16:03:52 +02:00
Thulinma
1d950f31ba Fix controller deadlock. 2016-05-28 13:45:19 +02:00
Thulinma
f010dcd0f7 Fix controller segfault on using fillActive function during stats update. 2016-05-27 21:08:39 +02:00
Thulinma
52d0c66166 Prevent re-initialized connections from counting bytes too eagerly. 2016-05-26 18:24:25 +02:00
Thulinma
8b87337314 Added debug message for connections switching away from an existing active session. 2016-05-26 18:16:50 +02:00
Thulinma
3c4bc6a006 Disable shared memory stats for Windows builds. 2016-05-25 12:24:56 +02:00
Thulinma
6caa02c63f Prevent sessions from becoming unset. 2016-05-24 11:12:54 +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
5fbf4dd23b SHM statistics in prometheus output 2016-05-23 14:32:01 +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
303cc5684a Fixed streams not deactivating with history still available. 2016-05-20 13:06:37 +02:00
Thulinma
9b2494f5d6 Fixed a race condition in push handling. 2016-05-19 17:42:21 +02:00
Erik Zandvliet
5c4e0d8c54 More reasonable size for metadata 2016-05-19 17:32:47 +02:00