Commit Graph

2611 Commits (e379faede58b9c22db18452b3998b7a41f33eccd)

Author SHA1 Message Date
Isaac Connor 4a54931292 Add ZM_TIME_FORMAT_PATTERN 2022-06-01 16:19:51 -04:00
Isaac Connor 5108c016cf Add ZM_LOCALE_DEFAULT, ZM_DATE_FORMAT_PATTERN and ZM_DATETIME_FORMAT_PATTERN config entries 2022-06-01 15:44:57 -04:00
Isaac Connor 06a59ff4af Test against a constant because None==1 not zero. Fixes failed suspend motion detection during move 2022-05-30 15:44:35 -04:00
Isaac Connor 4f0502fbe9 If shared_data:valid is invalid, disconnect and reconnect before erroring. 2022-05-30 15:43:54 -04:00
Isaac Connor 1fc66d3fbf Add debug of reason why we are not running a monitor 2022-05-30 09:52:24 -04:00
Isaac Connor 8f5850e404 Turn on debugging of DB requests in Monitor 2022-05-30 09:52:07 -04:00
Isaac Connor 76b844530b Config entries are not constants, duh 2022-05-19 14:06:30 -04:00
tftadmin Appleton 3d16be1f0f Only keep ZM_COOKIE_LIFETIME entries in Sessions. 2022-05-18 18:59:37 -04:00
Isaac Connor dd17bf5ef7 Make zmfilter.pl always honour ExecuteInterval. We might want it to be less than the default of 60 2022-05-17 14:49:54 -04:00
Isaac Connor f502883ebe Move code from Event to Storage to implement delete_path(). Implement delete_analysis_jpegs() 2022-05-17 12:30:49 -04:00
Isaac Connor 34610069ea Move code from Event to Storage to implement delete_path() 2022-05-17 12:29:46 -04:00
Isaac Connor 4349106270 Rough in zmeventtool with command deleteanalysisjpegs 2022-05-17 12:26:33 -04:00
Isaac Connor 923a98f000 At least test for valid shmem for monitors with capturing=OnDemand or Decoding=OnDemand 2022-05-10 11:46:11 -04:00
Isaac Connor b57c835ec6 Make ZM_PATH_FFMPEG a System config entry. Meaning it can only be set in /etc/zm/conf.d. Update help text to mention this. 2022-05-04 13:00:54 -04:00
Isaac Connor 6afd0ccfaf cleanup code and update System column in Config table on zmupdate.pl -f 2022-05-04 12:58:49 -04:00
Isaac Connor 7d9525e28b WARNING should be a DEBUG when restarting a process 2022-04-28 10:36:06 -04:00
Isaac Connor 5de88b8f9e zmwatch.pl can work if Decoding == Keyframes Only 2022-04-13 16:35:17 -04:00
Isaac Connor 906951e450 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-06 10:37:10 -04:00
Isaac Connor 0e337cd8bf Remove support for Cambozola which no longer works or is needed. 2022-04-06 10:37:02 -04:00
Isaac Connor 1f5d7866f7 Merge @alabamatoys' work to add focus controls 2022-04-06 09:03:27 -04:00
Isaac Connor 5b824f46c4 Load monitors when not in multi-server mode. 2022-04-04 15:06:34 -04:00
Isaac Connor 8046c21eeb Add parenthesis to make logic more clear 2022-04-04 14:53:08 -04:00
Isaac Connor 9d9b363536 Add backtrace when no primary key 2022-03-31 19:32:34 -04:00
Isaac Connor f95d184f02 Don't restart monitors that aren't decoding 2022-03-28 18:02:58 -04:00
Isaac Connor 8f013b55b2 Add Capturing, Analysing, Recording defaults. Add Decoding 2022-03-28 18:02:44 -04:00
Isaac Connor 55ae6ba4a5 rough in Url, UrlToZMS PathToZMS PathToIndex, UrlToIndex UrlToApi PathToApi in SERver object 2022-03-28 14:30:08 -04:00
Isaac Connor 0850e0db70 Remove Enabled test, replace with Capturing and Recording tests 2022-03-21 15:56:16 -04:00
Isaac Connor 965e256bbc remove space 2022-03-20 19:13:46 -04:00
Javier Gonzalez 6a2d0fa81a Fix 2022-03-09 21:14:25 +01:00
Javier Gonzalez 224d275950 Fix 2022-03-09 21:13:34 +01:00
Javier Gonzalez 3d093ed8a6 Fix monitor not change status when zoneminder state change 2022-03-09 21:07:39 +01:00
Javier Gonzalez 4a1dbc884d Fix zmpkg recording status 2022-03-09 19:40:04 +01:00
Javier Gonzalez 858ab62fc4 Fix when using a custom state 2022-03-08 17:10:29 +01:00
Isaac Connor 0785e3571c code style, remove duplicated code. 2022-03-08 09:06:31 -05:00
Isaac Connor a748b0ed0a When connecting to a monitor, if it fails, disconnect. This should fix a bug in zmtrigger and others where it would never reconnect. The idea is that we asked for a successful connection, if it failed, we shouldn't be in a failed connected state, we should be disconnected. 2022-03-08 09:06:06 -05:00
Isaac Connor 8fe0cb5e33 tidy up the mem_info hash and turn into a hash instead of a pointer to a hash. Check for validity flah before checking sizes. Improve debug logging. 2022-03-08 09:04:41 -05:00
Isaac Connor addfdcd330 Remove sets::isin references 2022-02-28 15:41:57 -05:00
Isaac Connor a32b77510d Fix logic on error reporting of failure to connect to db 2022-02-28 09:38:54 -05:00
Isaac Connor e33b41745d Merge branch 'master' into replace_function_concept 2022-02-27 14:04:01 -05:00
Isaac Connor 0bcb9d276f code style. 2022-02-26 18:25:51 -05:00
Isaac Connor 2bd85089f4 Put integers in quotes as well. Proper JSON has all values in quotes. This is important because integers like 0123 are invalid 2022-02-26 18:25:51 -05:00
Isaac Connor 2bc0ec269a Merge branch 'master' into replace_function_concept 2022-02-15 17:02:03 -05:00
Isaac Connor b2e0f805bd Add NOT IN case. Also, fix bad SQL when value evals to false. Test for empty string instead. Fixes #3425 2022-02-15 10:29:58 -05:00
Isaac Connor f66a463574 Merge branch 'master' into replace_function_concept 2022-02-08 12:07:30 -05:00
Isaac Connor a7dc9d4e36 Implement General::jsonLoad 2022-02-08 10:14:00 -05:00
Isaac Connor ac909d404a Use the reported move with x=0 y=0 for autostop in addition to old stop movement code 2022-02-03 18:19:07 -05:00
Isaac Connor ac39be33f5 Don't assume filename of mp4. We store it in the event record for a reason. Fixes #3422 2022-02-03 17:24:33 -05:00
Isaac Connor caebef3103 Replace uses of Function 2022-02-03 12:38:26 -05:00
Isaac Connor f40279b745 Remove active, add capturing, analysing, recording 2022-02-03 12:38:09 -05:00
Isaac Connor f7099bc6cb Replace another use of Function 2022-02-03 12:37:51 -05:00