Commit Graph

2401 Commits

Author SHA1 Message Date
Isaac Connor cb90c06cde Merge branch 'master' into zma_to_thread 2021-01-17 17:38:34 -05:00
Isaac Connor 1e59c5bbde Merge branch 'release-1.34' 2021-01-15 18:46:07 -05:00
Isaac Connor 7183a47a3a split Netcat security header into multiple lines for legibility 2021-01-15 18:45:13 -05:00
Isaac Connor f2fea95f4b Merge branch 'master' into zma_to_thread 2021-01-14 13:02:52 -05:00
Isaac Connor 02386f0c64 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED for zmfilter. 2021-01-14 12:56:54 -05:00
Isaac Connor cf2d987fc0 Add MIN_RTSP_PORT config item, but commented out for now 2021-01-11 13:46:50 -05:00
Isaac Connor 284b9f963f Merge branch 'master' into zma_to_thread 2020-12-29 12:18:26 -05:00
Isaac Connor c9ac5dff62 Use parent printMsg 2020-12-21 12:17:02 -05:00
Isaac Connor e123322d06 Merge branch 'master' into rtsp_server 2020-12-15 11:00:13 -05:00
Isaac Connor 99e7ae3505 Merge branch 'master' into rtsp_server 2020-12-15 10:14:19 -05:00
Isaac Connor bdf9a029ad Must require ZoneMinder::Monitor if we want to use it 2020-12-15 09:35:17 -05:00
Isaac Connor 9fec11c4a9 Add missing Monitor() function. 2020-12-14 14:41:34 -05:00
Isaac Connor 47b3f319e7 Add capture_fps and analysis_fps to shared memory. This also requires support for type double 2020-12-09 12:18:43 -05:00
Isaac Connor b0f2ff6302 Add Session cleaning 2020-12-08 10:21:55 -05:00
Isaac Connor b261fbb397 Merge branch 'master' into zma_to_thread 2020-12-07 16:26:26 -05:00
Isaac Connor b30b4cd66a Fall back to whatever Storage Areas are in the db or ZM_DIR_EVENTS if not specified in getDIskPercent and getDiskBlocks. Fixes #3081 2020-12-03 14:28:48 -05:00
Isaac Connor 5a489b3e99 Fall back to whatever Storage Areas are in the db or ZM_DIR_EVENTS if not specified in getDIskPercent and getDiskBlocks. Fixes #3081 2020-12-03 14:28:03 -05:00
Isaac Connor 6e64114ac3 Skip row locking in UpdateDiskSpace if the filter is already locking rows 2020-12-03 14:26:51 -05:00
Isaac Connor d1c3864778 Use the ZM_FONTDIR substitution instead of hardcoding a path 2020-12-01 09:21:54 -05:00
Isaac Connor 836cd2d58d Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font 2020-11-30 09:45:39 -05:00
hax0kartik b212b0e450 Allow modifying font file location 2020-11-28 20:18:17 +05:30
Andrew Bauer ff4b0e6309 add option to disable thumb animation 2020-11-25 13:03:16 -06: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 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 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
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
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 df783f4835 Merge branch 'master' into zma_to_thread 2020-11-12 12:53:55 -05:00
Isaac Connor 7b764d04d3 Fix use of next when it should be return. Improve some logging of errors. 2020-11-11 17:40:31 -05:00
Isaac Connor 076d649189 Include Record Monitors in zmtrigger 2020-11-11 16:12:30 -05:00
Isaac Connor 0aef0adf48 Fix more Monitors.Id => Monitor_Status.MonitorId 2020-11-11 11:32:54 -05:00
Isaac Connor 330023f65b Move Events totals to Monitor_Status instead of Monitors 2020-11-11 09:30:39 -05:00
Isaac Connor 159b383276 Move event stat totals to Monitor_Status. Implement a class for them called Monitor_Status 2020-11-06 13:27:47 -05:00
Isaac Connor adbd3486bf Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:49:39 -05:00
Isaac Connor 5fadd366e7 Always setup Logging SIG handlers. Implement SIGUSR1 and SIGUSR2 handling to match c++ side behaviour. Fixes #3057 2020-10-30 11:50:03 -04:00
Isaac Connor 65df84ef7e Make ZoneMinder::Event::delete aware of transactions 2020-10-30 11:49:00 -04:00
Isaac Connor 7a65a64644 add LockRows to Filters 2020-10-26 18:47:40 -04:00
Isaac Connor 90e81c5774 Merge branch 'release-1.34' 2020-10-23 09:34:35 -04:00
Isaac Connor a0f733615c allow empty string as a default value 2020-10-22 11:26:34 -04:00
Isaac Connor 40c57b4b23 Improve logic in set, improve logging 2020-10-22 10:43:53 -04:00
Isaac Connor 6c546f36ae allow dashes and underscores in log file name 2020-10-22 10:43:35 -04:00
Isaac Connor b950962f98 Revert WEB_EVENT_SORT_FIELD change from StartTime to StartDateTime back to StartTime. StartTime is the column name. 2020-10-20 19:21:15 -04:00
Isaac Connor 2eda49333f Merge branch 'master' into zma_to_thread 2020-10-20 16:20:29 -04:00
Isaac Connor 9c943fb079 Merge branch 'release-1.34' 2020-10-14 16:48:01 -04:00
Isaac Connor ba3b19d89a Clean up DiskSpace option. Doesn't need to be there and shouldn't set HashDiskPercent 2020-10-14 16:45:03 -04:00