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
|
a64102c890
|
Must preface config entries with ZM_ because we strip it out later
|
2022-03-21 16:09:29 -04:00 |
|
Isaac Connor
|
4f29875609
|
Fix password config type to be password in db
|
2022-03-21 16:08:13 -04:00 |
|
Isaac Connor
|
67f765bc82
|
Add password as a config entry type
|
2022-03-21 16:08:13 -04:00 |
|
Isaac Connor
|
d08cac052c
|
Add MQTT settings to config
|
2022-03-21 16:08:13 -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 |
|
Isaac Connor
|
10e39b3b13
|
:wqMerge branch 'master' into replace_function_concept
|
2022-02-02 17:08:01 -05:00 |
|
Isaac Connor
|
a4c91e9a3c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-02-02 14:36:15 -05:00 |
|
Isaac Connor
|
339f102196
|
Implement reboot and ping methods for Trendnet PTZ Control
|
2022-02-02 14:36:11 -05:00 |
|
Isaac Connor
|
48fc99a0e3
|
Implement reboot and ping methods for Trendnet PTZ Control
|
2022-02-02 14:34:53 -05:00 |
|
Isaac Connor
|
3feb4fcc51
|
Merge branch 'master' into master
|
2022-02-02 12:28:17 -05:00 |
|
Isaac Connor
|
1c1630e5b4
|
add require Filter and fix missing $
|
2022-02-01 17:23:16 -05:00 |
|
Isaac Connor
|
4d87b49f07
|
Remove weird cutnpaste User modules stuff from top of Filter.pm
|
2022-02-01 17:22:56 -05:00 |
|
Isaac Connor
|
c524298f8e
|
Rough in State module
|
2022-01-27 13:42:46 -05:00 |
|
Isaac Connor
|
86f393565e
|
Remove Function references and swap with appropriate Capturing, Analysing, Recording
|
2022-01-27 13:42:31 -05:00 |
|
Isaac Connor
|
23bfbcd6ce
|
Merge branch 'master' into multistream
|
2022-01-26 10:13:20 -05:00 |
Jonathan Bennett
|
ec9403fb6f
|
Adds Amcrest On-camera Motion Detection
|
2022-01-25 22:38:00 -06:00 |
|
Isaac Connor
|
3cc243b9a8
|
Don't freshing config when doing update. That is it's own command
|
2022-01-24 09:24:16 -05:00 |
|
Jonathan Bennett
|
8125aa633b
|
Merge branch 'ZoneMinder:master' into master
|
2022-01-22 12:20:13 -06:00 |
|
Isaac Connor
|
35efb111ac
|
Add Private to Config
|
2022-01-22 12:30:59 -05:00 |
|
Jonathan Bennett
|
52e48c02b6
|
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
|
2022-01-21 22:23:41 -06:00 |
|
Isaac Connor
|
27abe85036
|
replace active with analysing, capturing, recording
|
2022-01-13 22:14:44 -05:00 |
|
Isaac Connor
|
3504b13e2a
|
Merge branch 'master' into multistream
|
2022-01-13 12:29:34 -05:00 |
|
Isaac Connor
|
9b8ca69203
|
default interactive to whether we have stdio. So now when running from console it will default to interactive and when running from zmdc.pl will be non-interactive. Do check regardless of ZM_UPDATE_CHECK setting.
|
2022-01-13 12:26:47 -05:00 |
|
Isaac Connor
|
274ffd7da0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-01-13 12:02:14 -05:00 |
|
Isaac Connor
|
3cc1b74b4e
|
Merge branch 'master' into multistream
|
2022-01-13 10:21:58 -05:00 |
|
Isaac Connor
|
162e12bf92
|
default interactive to whether we have stdio. So now when running from console it will default to interactive and when running from zmdc.pl will be non-interactive. Do check regardless of ZM_UPDATE_CHECK setting.
|
2022-01-13 10:21:32 -05:00 |
|
Isaac Connor
|
58bd09d83d
|
Fix debug output from zmDbDo
|
2022-01-13 09:56:04 -05:00 |
|
Isaac Connor
|
3ec6c7e32f
|
Fix behaviour of update check to support interactive mode. Use zmDbDo functions to simplify code. When interactive print out lastVersion, latestVersion and currentVersion
|
2022-01-13 09:55:26 -05:00 |
|
Isaac Connor
|
3dad3a5200
|
update description to reflect that zmupdate.pl now does all the things it will someday do. Meantion how -c works better. When in interactive mode, check once and print out the result instead of daemonising. Fix formatting osf usage
|
2022-01-13 09:55:16 -05:00 |
|
Isaac Connor
|
e4f0c7cd98
|
Fix debug output from zmDbDo
|
2022-01-13 09:54:47 -05:00 |
|
Isaac Connor
|
b178b0af5e
|
Fix behaviour of update check to support interactive mode. Use zmDbDo functions to simplify code. When interactive print out lastVersion, latestVersion and currentVersion
|
2022-01-13 09:54:36 -05:00 |
|
Isaac Connor
|
cb1cbed8e7
|
update description to reflect that zmupdate.pl now does all the things it will someday do. Meantion how -c works better. When in interactive mode, check once and print out the result instead of daemonising. Fix formatting osf usage
|
2022-01-13 09:37:54 -05:00 |
|
Isaac Connor
|
e4693c251c
|
add backticks around field names because some like Function are reserved
|
2022-01-12 23:08:29 -05:00 |
|
Isaac Connor
|
8d06175024
|
Rework to use ZoneMinder::Monitor class. Simplify loadMonitors and get rid of loadMonitor. Add in ServerId change handling.
|
2022-01-12 23:07:48 -05:00 |
|
Isaac Connor
|
9243b1d081
|
Add debugging to zmDbDo
|
2022-01-11 12:43:42 -05:00 |
|
Isaac Connor
|
152efd0987
|
make aud_print add a newline if printing. Tidy up Event Summary updating, using zmDbDo.
|
2022-01-11 12:39:52 -05:00 |
|
Isaac Connor
|
1891537e91
|
Remove redundant logLevel from docs
|
2022-01-11 12:38:57 -05:00 |
|
Isaac Connor
|
3dcfd3e26e
|
reduce debug logging
|
2022-01-11 12:02:33 -05:00 |
|
Isaac Connor
|
fd3a70172d
|
Merge branch 'master' into multistream
|
2022-01-10 17:51:50 -05:00 |
|
Jonathan Bennett
|
1333d8c751
|
Adds ONVIF Motion Detection Support
|
2022-01-06 16:45:15 -06:00 |
|
Isaac Connor
|
99900e8c1d
|
Merge branch 'master' into multistream
|
2022-01-05 18:04:10 -05:00 |
|
Isaac Connor
|
aefed4e174
|
Merge branch 'master' into multistream
|
2022-01-05 18:03:44 -05:00 |
|
Isaac Connor
|
bc67493f91
|
Alter log level of restart events based on Importance setting
|
2022-01-05 16:49:20 -05:00 |
|
Isaac Connor
|
bfac696fb7
|
return logger from loginit so that we can use it
|
2022-01-05 16:49:00 -05:00 |
|
Isaac Connor
|
cce24ea427
|
Add RTSPServer and Importance fields
|
2022-01-05 16:48:46 -05:00 |
|
Isaac Connor
|
6bd04de5f6
|
Merge branch 'master' into multistream
|
2021-12-31 17:53:36 -05:00 |
|
Isaac Connor
|
2aacbf790a
|
handle warning due to not defined last_run
|
2021-12-26 11:51:32 -05:00 |
|
Isaac Connor
|
d86456b6f2
|
revamp, using ZoneMinder::Monitor methods to reduce code. Reduce last analysze time was zero to a debug. Fixes #3389
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
12ebdacf54
|
specify ZoneMinder::Database for zmSQLExecute
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
fe0e4627ef
|
Specify ZoneMinder::General for runCommand
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
28d5614da0
|
Fix missing ;
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
f683557b0e
|
Fix Monitor::Control to handle local cameras
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
4fa804e9a2
|
Can only SKIP LOCKED if locking rows. Remove FOR SHARE as it isn't supported on < mysql 8
|
2021-12-14 13:33:00 -05:00 |
|
Isaac Connor
|
fe72fd83f8
|
Fix auth not getting realm from auth headers due to them being an array now. Get auth and ip from Path if not set in ControlAddress.
|
2021-12-14 10:04:35 -05:00 |