Commit Graph

16999 Commits

Author SHA1 Message Date
Isaac Connor 4deb3a8d84 escape the word Groups 2020-11-23 19:31:21 -05:00
Isaac Connor e0a30ab5e0 Only log an error if we haven't been given sigpipe. 2020-11-22 17:28:53 -05:00
Isaac Connor 660636c0e2 loop if we get egain when flocking. Warn when format not specified. 2020-11-22 16:54:42 -05:00
Isaac Connor 4d8f45d284 There is no need to copy query. We do not modify it. 2020-11-21 16:59:21 -05:00
Isaac Connor 1b472edc2b fix cast 2020-11-21 16:58:22 -05:00
Isaac Connor 51ebaecc44 Fix MN and the various Event Total substitutions 2020-11-21 15:10:23 -05:00
Isaac Connor 98c2c6cccf Add Status,CaptureFPS,AnalysisFPS, CaptureBandWidth to MonitorStatus fields 2020-11-21 15:09:43 -05:00
Isaac Connor 30363c1d4b Add Monitor Status loading 2020-11-21 15:08:29 -05:00
Isaac Connor b44f14691e Don't exit after 30 minutes. Google code style. 2020-11-21 15:08:09 -05:00
Isaac Connor 6da673dd69 remove unused includes 2020-11-21 09:25:36 -05:00
Isaac Connor 5f4fb4200f googe code style 2020-11-21 09:25:10 -05:00
Isaac Connor 2cdf0da3c0 Remove unused includes and apply google code style 2020-11-21 09:15:36 -05:00
Isaac Connor 271dcbc4e8 select returns EINTR when HUP'd. This is not fatal. Handling this gracefully reduces log spam 2020-11-21 09:12:41 -05:00
Isaac Connor 0d71b18097 Merge branch 'release-1.34' 2020-11-20 16:39:40 -05:00
Isaac Connor 1b5448ede4 Handle there being no services in the response 2020-11-20 16:35:48 -05:00
Isaac Connor 7653a058a3 More correct code for setting source 2020-11-20 16:31:40 -05:00
Isaac Connor e1a0c4f973 Don't log a warning of comms not open if no connkey 2020-11-20 16:31:12 -05:00
Isaac Connor 65d4c43cc2 Use BOUNDARY instead of ZoneMinderFrame. If we get EAGAIN when flocking, try again. 2020-11-20 16:29:10 -05:00
Isaac Connor 4f178e47bc Break early after setting zm_terminate so that zms quits faster. Use a basic assignment instead of memcpy for last_frame_timestamp 2020-11-19 16:39:53 -05:00
Isaac Connor 03f033cf36 cleanup MOnitor destructor. Most of the freeing is done in disconnect now. Fixes zms crash 2020-11-19 16:39:14 -05:00
Isaac Connor 3f1e7e793f update buffertype after DumpBUffer 2020-11-19 16:38:49 -05:00
Isaac Connor 58ccea6aa8 use better c++ class initialisation. Use ZM_BUFTYPE_DONTFREE instead of 0 for init buffertype. 2020-11-19 16:37:28 -05:00
Isaac Connor 634a3dbe81 fix crashes/memleaks when waiting for a zmc process to start. Fix other memleaks 2020-11-19 10:43:02 -05:00
Isaac Connor ae4e2a1d5e We were overwriting the privacy/inactive zone with a more general one. Slight memleak 2020-11-19 10:42:17 -05:00
Isaac Connor 74972be9b5 spacing, code style. Set row=nullptr to quiet valgrind 2020-11-18 13:15:52 -05:00
Isaac Connor d4253be69f Use proper C++ initializer for Config. Don't copy the sql string, just use it from whereever in ram it is. 2020-11-18 13:15:07 -05:00
Isaac Connor cf08010ebe Fix redirect on zone editing 2020-11-18 13:04:56 -05:00
Isaac Connor 6542072334 fix logic causing segfault instead of waiting for zmc. Remove trailing whitespaces 2020-11-18 09:56:13 -05:00
Isaac Connor 9713a2ec00 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-17 11:09:31 -05:00
Isaac Connor d5295a4464 Fix segfaults and valgrind complaints. Initialize vncClientData, handle failure to connect freeing our client. 2020-11-17 11:08:11 -05:00
Isaac Connor ec5e6b392b Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-11-16 11:33:00 -05:00
Isaac Connor 5bf5d58ac1 Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds. 2020-11-16 11:32:50 -05:00
Isaac Connor a47b72af49 Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds. 2020-11-16 11:31:36 -05:00
Andrew Bauer a2b5271835 fix copy/paste typo 2020-11-14 17:34:59 -06:00
Andrew Bauer 0ffb5e153c modify FilterTerm to support Frames view searches 2020-11-14 17:33:18 -06:00
Andrew Bauer 416d68a971 rough in support for frames view search function 2020-11-14 16:49:22 -06:00
Andrew Bauer 45fbdfa050 rough in support for frames view search function 2020-11-14 16:01:34 -06:00
Andrew Bauer f3756def08 deploy server side pagination for frames view 2020-11-14 14:45:22 -06:00
Andrew Bauer 9aa6fea6a3 frames view server pagination WIP 2020-11-14 14:19:28 -06:00
Andrew Bauer f88d721ae3 fix issue with events view and ALL pagination 2020-11-14 10:27:33 -06:00
Isaac Connor f32d10a1ab Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-13 17:16:13 -05:00
Isaac Connor 66f7cc55dc Spacing code comments, quotes 2020-11-13 17:05:23 -05:00
Isaac Connor d2a203014f rename diagpipe-r so that we don't have to create directories in SOCKS_DIR 2020-11-13 17:05:03 -05:00
Isaac Connor a0dcdd135a DefaultRate and DefaultScale are Monitor properties, so just load them in a Monitor object so we don't have to JOIN the Monitors table 2020-11-13 17:04:22 -05:00
Isaac Connor f1b8266e26 Only join storage and Monitors if necessary 2020-11-13 17:03:51 -05:00
Andrew Bauer 52e747791d rough in frames server pagination backend 2020-11-13 12:34:01 -06:00
Isaac Connor 23f27d5a11 include frame_type in debug message 2020-11-13 12:43:31 -05:00
Isaac Connor 08a8155b47 Implement a Monitor::disconnect function. Fix Fatals during connect and cleanup Analysis Monitor code to wait around for zmc. Handle zmc going away gracefully. Fixes a slow zma startup due to zmc not being setup yet. 2020-11-13 12:27:51 -05:00
Isaac Connor da99426535 if monitor is not found call loadMonitors to make sure it isn't new 2020-11-13 10:40:55 -05:00
Isaac Connor a581cb9de1 Make various text input options be 90% 2020-11-13 10:18:35 -05:00