Commit Graph

2491 Commits

Author SHA1 Message Date
Isaac Connor afc21cd14d If we are starting a process that is waiting to term, mark it to get started by the reaper. Fixes case where zmdc thought the process was still running and so didn't start it. We never noticed because zmwatch would eventually notice. The result is instant restart. 2021-11-29 13:54:11 -05:00
Isaac Connor 765886ae72 Handle bug where a value of '' will prevent special case handling. Allow '' to mean NULL when specifying Storage Area 2021-11-29 13:52:05 -05:00
Isaac Connor 84b8e43034 Only start a transaction if we are not already in a transaction 2021-10-28 15:28:55 -04:00
Isaac Connor 15a7c22b94 layout->layer 2021-10-28 15:26:12 -04:00
ColorfullyZhang d7abdb1505 Set character set as utf8 when connect to mysql to avoid mistakes when there are Chinese characters in storage path. 2021-10-28 15:18:55 -04:00
Isaac Connor ee30c0f05e add a comment about rollbacks 2021-10-28 12:03:58 -04:00
Isaac Connor a6795cd026 Just return the error 2021-10-28 11:59:36 -04:00
Isaac Connor 6e68a35861 Remove dead code, remove locking from CopyTo, put locking into MoveTo. 2021-10-28 11:59:23 -04:00
Isaac Connor dd758aacac Fix Event count subsitutions in emails because they are no longer in Monitor_Status. They are in Event_Summaries. So create a new object for them and use it. 2021-10-27 12:21:30 -04:00
Isaac Connor 522f8dd5ba Do no commit on error as it releases locks. Add better storage loading error handling 2021-10-25 09:44:27 -04:00
Isaac Connor a258567c16 You cannot commit on error because it releases the locks. 2021-10-25 09:44:27 -04:00
Isaac Connor b5bb5e67ff Change commands used to set and goto presets. Fixes #3371 2021-10-19 13:16:21 -04:00
Isaac Connor 7905f11be6 remove useless commit. 2021-09-25 14:27:26 -04:00
Isaac Connor 5475b44852 Fix html emails when using ZM_NEW_MAIL_MODULES. Improve debugging and reduce Info logging 2021-09-10 18:01:04 -04:00
Isaac Connor ad1db2c960 Only suspend/resume motion detection if the monitor is doing motion detection 2021-09-08 13:59:34 -04:00
criadoperez 4d09e5f93f Fixed broken wiki links 2021-09-08 13:59:07 -04:00
Isaac Connor 09d4f0f9c2 Add missing fields. defaults need to be quoted because they are evalled 2021-09-04 10:44:12 -04:00
Isaac Connor 29e8d39c74 defaults need to be quoted because they are evalled 2021-09-04 10:44:04 -04:00
Isaac Connor b0df3fd2f6 Fix user summary, as there must be a space between -u and dbuser, etc 2021-09-04 10:02:43 -04:00
Isaac Connor 583c259951 Spacing 2021-09-04 10:02:16 -04:00
Isaac Connor 8da5a1d2c9 If we fail to suspend/resume, assume we need to disconnect/reconnect to the mmap 2021-09-04 10:00:55 -04:00
Isaac Connor 9ebff52c44 Add a 5 second timeout when setting suspending/resuming motion detection.Log errors appropriately 2021-09-04 10:00:42 -04:00
Isaac Connor e9dab48834 Fix building SQL for ExistsInFileSystem PostCondition. Fix how we turn the rows into Event objects. Fix value handling in ExistsInFileSystem post condition. 2021-09-04 09:59:38 -04:00
Isaac Connor f319d02373 Fix PTZ Diagonal cmds. Fixes #3300 2021-09-03 22:39:44 -04:00
Isaac Connor c00651e826 Spacing 2021-09-03 11:34:32 -04:00
Isaac Connor 3e59ad9cb4 Test for existence of file before adding it to zip. Apparently our glob can return the snapshot.jpg string even if it doesn't exist. This is a workaround to Archive::Zip not testing for failure and crashing. Fixes #3313 2021-07-08 11:06:20 -04:00
Isaac Connor cb3dd78c61 Fix Archive FTP .zip filename not including monitor name. Fixes #3304 2021-06-23 10:27:23 -04:00
Isaac Connor f6c29b51ef Fix EndTime case handling. 2021-06-14 11:58:06 -04:00
Isaac Connor db0f9911ae merge fixes from #3295. Fixes #3295. 2021-06-14 09:55:43 -04:00
Isaac Connor be5c6371bb zmstats.pl: add use warnings. Fix log deletion only ever deleting 100 when it should delete more in a loop. Add deleting more than 100 sessions. Fix loop not terminating on Ctrl-C 2021-06-08 13:01:30 -04:00
Isaac Connor bdae5dd9f8 Sort field should be StartDateTime not StartTime 2021-05-12 10:32:03 -04:00
Isaac Connor c080dd8a12 Fixes #2992. If no definition for a monitor is found, don't modify it. 2021-05-11 15:29:10 -04:00
Isaac Connor 9ee5e983d6 Add ZM_FEATURES_SNAPSHOTS to Config. Fix true=>yes 2021-05-04 13:19:10 -04:00
Isaac Connor 91a09608ea Use newlines to make debugging sql easier to read. 2021-05-02 13:37:26 -04:00
Isaac Connor 202c4ef28c copy array_diff sub into Object so we don't have the dependency 2021-04-29 19:00:36 -04:00
Isaac Connor e32771c255 Add Zones() to Monitor 2021-04-29 14:49:39 -04:00
Isaac Connor 69098ccdcb Implement changes() in Object 2021-04-29 14:49:30 -04:00
Isaac Connor a8bd1662e3 Add objdetect.gif support in filter email replacements 2021-04-28 19:12:37 -04:00
Isaac Connor 2302d814f2 Fix version test. split takes a regexp, so '.' matches everything. So change it to /\./. 2021-04-28 13:25:01 -04:00
Isaac Connor c50c30c6b5 Add super command line param to use mysql --defaults-file instead of zmuser/zmpass. This will only work for debian based systems. 2021-04-28 10:03:26 -04:00
Isaac Connor df754f0085 Can't do suspend in sendCmd 2021-04-24 19:22:17 -04:00
Isaac Connor 8d4c2afda8 Can't do suspend in sendCmd 2021-04-24 12:00:38 -04:00
Isaac Connor 4843cb8593 Add ModectDuringPTZ and suspend and resume functions 2021-04-23 14:52:29 -04:00
Isaac Connor e256d9a5a8 Use ZoneMinder::Monitor->find_one instead of zmDbGetMonitor so that we get an object with useful methods 2021-04-23 14:52:29 -04:00
Isaac Connor 36ac473ad2 Add suspend/resume of MotionDetection of ModectDuringPTZ is off. 2021-04-23 14:52:29 -04:00
Isaac Connor 7c70c26fbd Cleanup old Continuous stop. Rename lastMove to LastCmd and implement for Zoom 2021-04-21 14:30:02 -04:00
Isaac Connor 79cede7cac Merge branch 'release-1.34' 2021-04-20 09:24:49 -04:00
Isaac Connor ed58447c4d Only update event StorageId when the new StorageId has a value 2021-04-19 17:53:08 -04:00
Isaac Connor 7485735e9c Change url used for authentication to magicBox.cgi?action=getDeviceType 2021-04-19 17:31:22 -04:00
Isaac Connor 6225b8babe Indicate that there should be a space after single char options and their value 2021-04-19 11:56:59 -04:00