99900e8c1d
Merge branch 'master' into multistream
2022-01-05 18:04:10 -05:00
bc67493f91
Alter log level of restart events based on Importance setting
2022-01-05 16:49:20 -05:00
6bd04de5f6
Merge branch 'master' into multistream
2021-12-31 17:53:36 -05:00
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
509cecf9f5
Skip image checking capturing==Ondemand
2021-10-25 16:52:20 -04:00
1a0d488457
Spacing
2021-08-30 13:32:43 -04:00
ec8e0f5997
replace while(1) with while(not zm_terminate) so that these scripts exit cleanly
2021-03-17 13:09:54 -04:00
284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
766a59884d
Don't hard code perl path. Use PERL_EXECUTABLE cmake var
2019-09-23 12:54:27 -04:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
9a33e55efc
Bump log level to warning if we are restarting any daemons. Daemons should NOT need to be restarted in a healthy system.
2019-06-13 11:53:26 -04:00
e15227d53e
remove zma restarts
2018-12-26 18:18:22 -05:00
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -04:00
426aeea95b
add db reconnects to zmwatch.
2018-09-07 16:29:23 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
c98339e152
Google code style, list monitor in debug line listing LastWriteTime
2018-05-24 10:49:20 -04:00
f6139d33ed
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:25:11 -04:00
a35412f71d
Merge ../ZoneMinder.master
2018-04-26 21:58:01 -04:00
86b2f6a12e
New Monitor Type - Website ( #2065 )
...
* implement website monitor
* don't check certain fields when using website monitor
* continue to fix javascript errors for website monitors
* check $monitor, not $new_monitor here
* add website monitor documentation
was somehow left out of the initial commit
* fix corruption of functions.php
* add missing comma
* remove errors by testing for existence of key. If it's a new monitor, then none of the keys will be valid
* If the monitor type is WebSite, then default Status to Running.
* put back start function that got lost in merge. Don't start StreamCmd's if it's a WebSite
* Add midding comma
* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite
* Don't show control or any of the status fields for WebSite type monitors
* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
e3161687ba
google code style
2018-04-23 11:16:37 -04:00
e25af4b40c
cleanup, reset result
2018-02-02 16:07:13 -05:00
573c44839a
Merge branch 'storageareas' into zma_to_thread
2018-01-16 17:39:37 -05:00
e7274a8f91
cleanup. Restart zma when restarting zmc because it may hold the mmap open
2018-01-11 22:53:26 +01:00
b86d32c005
When we need to restart zmc, we may need to restart zma due to not enough space in /dev/shm.
2018-01-11 15:00:05 -05:00
c3ab7d5269
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_packetqueue.cpp
src/zma.cpp
2018-01-10 14:24:46 -05:00
4f6ab05e9e
Remove stats updating from zmwatch.pl.in, where it shouldn't be
2018-01-10 12:58:04 -05:00
1db4d7df83
start work on Events_(Hour|Day|Month|etc) tables for the event count data
2018-01-09 16:35:28 -05:00
e877fa1d61
make zmupdate_1.31.19 re-runable.
2018-01-08 14:49:57 -05:00
baa360cd3d
update event stat counts for all monitors at once
2018-01-07 14:20:17 -05:00
36ef0f5011
Merge branch 'storageareas' into zma_to_thread
2018-01-05 10:06:18 -05:00
68166719ca
Update the SQL that updates the monitor counts to be more efficient.
2018-01-04 17:15:46 -05:00
db0e35bf55
Move eventcounts update from zmwatch.pl to triggers and zmaudit.pl
2018-01-04 15:04:13 -05:00
2cc185fd45
Move Updating Storage stats to a trigger. Remove the code from zmwatch that did it before
2018-01-04 13:06:28 -05:00
90820ab92a
Merge branch 'storageareas' into zma_to_thread
2017-12-07 10:37:04 -05:00
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
4d73ce4109
rework locking to have a per-packet mutex
2017-12-03 11:09:01 -05:00
99968dfa2a
Merge branch 'storageareas' into zma_to_thread
2017-11-27 11:28:36 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
485567349d
Don't calc DiskSpace if it is already defined
2017-11-23 07:29:05 -08:00
9d6b417b60
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
2017-11-22 17:03:37 -08:00
bf6312a8ec
put back zma
2017-11-21 23:56:05 -05:00
c6515b7564
Merge branch 'storageareas' into zma_to_thread
2017-11-21 12:28:41 -05:00
bac3fbfce9
fix compile on old ffmpeg
2017-11-14 08:55:00 -08:00
d11a2947bb
use Id instead of id
2017-08-24 10:44:14 -04:00
7502b81064
zmMemVerify now checks valid, so don't need to do it again.
2017-01-10 15:32:38 -05:00
04f66917ae
Merge branch 'fix_mmap_leak' into storageareas
2017-01-10 15:29:54 -05:00
66cdcd95fa
Merge branch 'master' into fix_mmap_leak
2017-01-10 08:47:46 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
Isaac Connor
Isaac Connor
Andrew Bauer
Isaac Connor
Isaac
Isaac Connor
Andy Bauer