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
|
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
|
3feb4fcc51
|
Merge branch 'master' into master
|
2022-02-02 12:28:17 -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
|
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
|
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
|
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 |
|
Jonathan Bennett
|
1333d8c751
|
Adds ONVIF Motion Detection Support
|
2022-01-06 16:45:15 -06: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
|
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 |
|
Isaac Connor
|
a65f2b42ce
|
Implement per-filter delays using the ExecuteInterval member of Filters. Remove uneded lockandload when doing row locks. We will have already locked when executing the filter sql.
|
2021-12-13 14:59:38 -05:00 |
|
Isaac Connor
|
0382a677df
|
Add ExecuteInterval to Filter Object. Allow empty sort_field to have the effort of not sorting. Always add FOR SHARE which adds a read-only lock the returned records. Add SKIP LOCKED functionality so that filters can simply skip locked records. This should reduce contention. Also specify FOR UPDATE of the events table, otherwise we also lock Monitors and Storage.
|
2021-12-13 14:58:32 -05:00 |
|
Isaac Connor
|
ef13c84d8b
|
fix zmtrigger. Need {}
|
2021-12-12 17:01:12 -05:00 |
|
Isaac Connor
|
ed360348ef
|
spacing, remove dead code. If Monitor Function becomes None, skip it
|
2021-12-10 15:36:47 -05:00 |
|
Isaac Connor
|
aa320cb28f
|
Fix missing STATE_UNKNOWN
|
2021-12-10 15:35:53 -05:00 |
|
Isaac Connor
|
35bca1d89b
|
When launching concurrent zmfilter, use the id instead of Name because Name isn't necessarily unique
|
2021-12-06 10:32:17 -05:00 |
|
Isaac Connor
|
3b84d7d82a
|
Add --daemon to command line documentation so it ends up in man page. Fixes #3393. Improve the description and move the pod documentation to the bottom after __END__. Improve executeCommand a bit
|
2021-12-06 10:28:02 -05:00 |
maddios
|
b47e96d7cf
|
Fix Copy/Move to Default Storage
When moving from a 2nd storage to Default it fails with "New storage does not have an id. Moving will not happen" because the default ID is 0.
|
2021-11-29 00:20:25 -05:00 |
|
Isaac Connor
|
f9f2615d48
|
Return if unable to lock the event record. Improve code around CopyTo call.
|
2021-11-26 15:26:38 -05:00 |
|
Isaac Connor
|
af5436d009
|
Handle bug where a value of '' will prevent special case handling. Allow '' to mean NULL when specifying Storage Area
|
2021-11-26 10:31:54 -05:00 |
|
Isaac Connor
|
ffdb0f9824
|
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-23 11:05:39 -05:00 |
|
Isaac Connor
|
40e7f607f5
|
If no protocol defined, fall back to the name of the Control
|
2021-11-22 11:38:40 -05:00 |
|
Isaac Connor
|
2c798069d3
|
improve debug logging when loading Control in Monitor
|
2021-11-18 18:12:07 -05:00 |
|
Isaac Connor
|
20629fdf5a
|
Include Manufacturer and Model in telemetry
|
2021-11-16 09:20:14 -05:00 |
|
Isaac Connor
|
df88c5bbef
|
layout->layer
|
2021-10-28 15:28:03 -04:00 |
|
Isaac Connor
|
4122ae99a5
|
add a comment about rollbacks
|
2021-10-28 15:27:45 -04:00 |
|
Isaac Connor
|
644c6e6b41
|
Just return the error
|
2021-10-28 11:48:08 -04:00 |
|
Isaac Connor
|
9fe2762bc8
|
Add mp4 as an option for generated video and make it the default instead of avi
|
2021-10-28 10:46:50 -04:00 |
|
Isaac Connor
|
6478999ecf
|
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:03 -04:00 |
|
Isaac Connor
|
a74b785d08
|
Move the protocol loading into the Monitor Object.
|
2021-10-26 18:15:43 -04:00 |
|
Isaac Connor
|
a2ec18be5a
|
Implement Control() function to implement the Protocol Specific Control object
|
2021-10-26 18:15:43 -04:00 |
|
Isaac Connor
|
d62d88a0a3
|
add utility functions parseNameEqualsValueToHash and hash_diff
|
2021-10-26 18:15:43 -04:00 |