Isaac Connor
|
3aa31fd524
|
Merge branch 'master' into storageareas
|
2018-02-23 10:23:35 -05:00 |
|
Isaac Connor
|
3eaf95c607
|
handle Storage reload request
|
2018-02-21 14:09:51 -05:00 |
|
Isaac Connor
|
449ac87af1
|
force reload on Storage in Event object when moving
|
2018-02-21 14:09:12 -05:00 |
|
Isaac Connor
|
af560b8291
|
SIG{TERM} can be empty
|
2018-02-19 15:14:36 -05:00 |
|
Isaac Connor
|
ddeb2e61ef
|
add error logging
|
2018-02-18 11:29:15 -05:00 |
Isaac Connor
|
e634e0addc
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-02-17 12:25:42 -05:00 |
|
Isaac Connor
|
6883350e47
|
spacing/quotes/google code style. Always close and reopen logfile, as the filename may have changed
|
2018-02-15 10:00:13 -05:00 |
|
Isaac Connor
|
af003227c3
|
Don't do day/hour/week/month totals from main events table anymore
|
2018-02-13 11:41:35 -05:00 |
|
Isaac Connor
|
6cfce1d5f2
|
Improve logging
|
2018-02-13 11:27:20 -05:00 |
|
Isaac Connor
|
0f2cf65039
|
adjust kill timeouts. Give each process up to 10 seconds to exit
|
2018-02-13 06:21:39 -05:00 |
|
Isaac Connor
|
62b0a1ecdc
|
Add some debugging to tell what we are doing
|
2018-02-12 13:25:11 -05:00 |
|
Isaac Connor
|
c0eb0011f0
|
Make some errors just errors instead of fatal. Add a check for plural days in log cleaning
|
2018-02-11 14:18:10 -05:00 |
|
Isaac Connor
|
956f9ee193
|
if there is a custom term handler in place, call it when Fatal
|
2018-02-11 14:17:44 -05:00 |
Isaac
|
208d563e11
|
fix Event => __git_main[0]
|
2018-02-09 02:09:00 +01:00 |
|
Isaac Connor
|
069d53a9a0
|
Add the object debug when path to event does not exist in DiskSpace
|
2018-02-07 08:02:37 -05:00 |
flashoftheblades
|
630dde26d1
|
Add files via upload
|
2018-02-05 18:52:05 -05:00 |
|
Isaac Connor
|
8e547134d5
|
Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl
|
2018-02-03 14:50:19 -05:00 |
|
Isaac Connor
|
e25af4b40c
|
cleanup, reset result
|
2018-02-02 16:07:13 -05:00 |
Isaac Connor
|
f702b37445
|
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
|
2018-02-02 12:09:03 -05:00 |
|
Isaac Connor
|
8e8b6bdc36
|
Select Events by StorageArea
|
2018-02-02 12:08:54 -05:00 |
|
Isaac Connor
|
0287868f5e
|
include the status when error runCommand
|
2018-02-02 11:06:47 -05:00 |
|
Isaac Connor
|
87ef17dddc
|
errors running a command should NOT exit!
|
2018-02-02 11:05:56 -05:00 |
|
Isaac Connor
|
2861779249
|
move zmonvif-probe.pl from the onvif library code and update it to use ZoneMinder::ONVIF
|
2018-01-31 16:57:17 -05:00 |
|
Isaac Connor
|
c96f47886c
|
Fix discover not picking up a 1.2 response if we already have a 1.1
|
2018-01-31 16:56:46 -05:00 |
|
Isaac Connor
|
4933b37b69
|
fix log levels
|
2018-01-30 10:45:32 -05:00 |
|
Isaac Connor
|
aea1816e8e
|
Add in signal handlers to as to complete an action before exiting.
|
2018-01-30 09:19:08 -05:00 |
|
Isaac Connor
|
9f5c8078fc
|
handle when reading the link returns nothing
|
2018-01-29 21:16:41 -05:00 |
Isaac Connor
|
3c635d2f6a
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-26 13:07:59 -08:00 |
|
Isaac Connor
|
7fc29fe681
|
List starttime of orphaned event
|
2018-01-26 16:07:26 -05:00 |
|
Isaac Connor
|
e824f0abfe
|
use a big Y to indicate that hitting enter will result in Y. Also list q as an option to quit
|
2018-01-26 16:05:43 -05:00 |
|
Isaac Connor
|
30404203ea
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-26 12:54:56 -08:00 |
|
Isaac Connor
|
a12030fda7
|
Handle no storageareas found
|
2018-01-26 12:54:54 -08:00 |
|
Isaac Connor
|
2f39e44f91
|
Finish implementing single monitor mod
|
2018-01-26 15:53:47 -05:00 |
|
Isaac Connor
|
209093a4c6
|
Improve debug output
|
2018-01-26 10:32:37 -05:00 |
|
Isaac Connor
|
0bd1ee5992
|
Merge branch 'master' into m
|
2018-01-25 08:43:31 -05:00 |
|
Isaac Connor
|
c930a7cce6
|
fix crash
|
2018-01-24 15:29:49 -05:00 |
|
Isaac Connor
|
e4c900a868
|
Use a LEFT JOIN on Storage WHEN Running Filters
|
2018-01-24 12:34:06 -05:00 |
|
Isaac Connor
|
1800c6fcf0
|
Add locking around Event deletion
|
2018-01-24 12:16:34 -05:00 |
|
Isaac Connor
|
cf4ac74d02
|
If failed to delete from Frames or Stats, return instead of deleting the event.
|
2018-01-24 10:45:42 -05:00 |
|
Isaac
|
83371d0f21
|
Fix Error => Debug
|
2018-01-23 17:42:57 +01:00 |
Simpler1
|
ce19c65cc9
|
Ipcc (#2040)
* fix(ipcc): Invert up/down to work properly
* fix(ipcc): Change the initial values for ipcc camera
|
2018-01-22 15:33:11 -05:00 |
|
Isaac Connor
|
e60a86a061
|
improve debug output
|
2018-01-22 15:26:18 -05:00 |
|
Isaac Connor
|
37ff7c3779
|
Add finding by Id to Event
|
2018-01-22 15:26:01 -05:00 |
|
Isaac Connor
|
2068a5c684
|
Add object caching
|
2018-01-22 15:25:51 -05:00 |
|
Isaac Connor
|
d63594b5fa
|
don't do updates in a transaction so we don't hold locks
|
2018-01-22 14:06:52 -05:00 |
|
Isaac Connor
|
94fc8013c6
|
use a smarter glob to pick up events that were Deep, when the storage area is now Medium.
|
2018-01-22 11:10:31 -05:00 |
|
Isaac Connor
|
b317748796
|
Add Server loading
|
2018-01-22 11:09:49 -05:00 |
|
Isaac Connor
|
493a2386c4
|
Only load Time from StartTime if it has a value. Parse Path to get LInkPath if no Time.
|
2018-01-22 11:09:35 -05:00 |
|
Isaac
|
63351b5494
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-21 23:18:45 +01:00 |
|
Isaac Connor
|
a67c34fcad
|
Allow specifiying storagearea to audit
|
2018-01-21 17:14:32 -05:00 |
|
Isaac
|
c5332a255b
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-21 21:11:28 +01:00 |
|
Isaac
|
fedd67a7f6
|
add to_string
|
2018-01-21 21:11:05 +01:00 |
|
Isaac Connor
|
6d46a02a9a
|
DbReconnect if the db connection goes down
|
2018-01-19 18:25:24 -05:00 |
|
Isaac Connor
|
43d72decac
|
Turn off extra debugging
|
2018-01-19 18:24:59 -05:00 |
|
Isaac Connor
|
2682686063
|
Must disconnect and reconnect before calling update script
|
2018-01-19 16:32:26 -05:00 |
|
Isaac Connor
|
dfce773341
|
We should return the value of DiskSpace
|
2018-01-19 13:32:28 -05:00 |
|
Isaac
|
62704601ca
|
We should return the value of DIskSpace
|
2018-01-19 19:22:43 +01:00 |
|
Isaac Connor
|
e8603b6065
|
Use coalesce to handle NULLs
|
2018-01-19 13:08:13 -05:00 |
|
Isaac Connor
|
8935b77a12
|
Add a CTRL-C INT handler as well. Log more info about deleting events
|
2018-01-19 12:14:36 -05:00 |
|
Isaac Connor
|
17a29f7e83
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-19 11:40:14 -05:00 |
|
Isaac Connor
|
4d9f90488f
|
Add a TERM and HUP handler, clean up pid file on term. Add --force command line option to tell zmaudit.pl to continue even if a pid file exists.
|
2018-01-19 11:40:07 -05:00 |
|
Isaac Connor
|
9fb1074875
|
add auto-scheme detection from path. Fix de-tainting in delete_files
|
2018-01-19 11:39:31 -05:00 |
|
Isaac Connor
|
3749eb3e6f
|
Only send kill once. No point in repeating it
|
2018-01-19 08:19:10 -08:00 |
|
Isaac Connor
|
5472a1a012
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-18 11:40:37 -05:00 |
|
Isaac Connor
|
715adb5acb
|
add locking to Event moving and diskspace updating.
|
2018-01-18 11:38:08 -05:00 |
|
Isaac Connor
|
655d7be3c9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-17 12:59:59 -08:00 |
|
Isaac Connor
|
eb92a1ed8b
|
merge updates that fix Event moving
|
2018-01-17 12:59:34 -08:00 |
|
Isaac Connor
|
b71581922f
|
Only update db record if there is a change in diskspace
|
2018-01-17 12:56:37 -08:00 |
|
Isaac Connor
|
306e9a75ee
|
Fix issues with a period in the column name
|
2018-01-16 21:45:01 -05:00 |
|
Isaac Connor
|
426976ddb7
|
cleanup return code
|
2018-01-16 14:04:44 -05:00 |
|
Isaac Connor
|
aaa6c5cccb
|
Only delete files if no error
|
2018-01-16 14:01:26 -05:00 |
|
Isaac Connor
|
dfb7079f83
|
FIX update interval.
|
2018-01-16 09:32:18 -05:00 |
|
Isaac Connor
|
abec2ce4cd
|
Add code to optionally run zmstats.pl and zmaudit.pl
|
2018-01-16 09:31:58 -05:00 |
|
Isaac Connor
|
f808d187c1
|
Fix logic update Server stats update line
|
2018-01-15 19:23:59 -05:00 |
|
Isaac Connor
|
1d6c9d6edd
|
Empty Storage Name should not be Fatal
|
2018-01-13 10:14:11 -05:00 |
|
Isaac
|
12d310a9cb
|
Cleanup
|
2018-01-11 22:53:34 +01:00 |
|
Isaac
|
e7274a8f91
|
cleanup. Restart zma when restarting zmc because it may hold the mmap open
|
2018-01-11 22:53:26 +01:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
89ddb8cf5d
|
Fix re for identifying event when using Medium storage scheme
|
2018-01-10 15:36:36 -05:00 |
|
Isaac Connor
|
5792021ee3
|
Merge branch 'storageareas' into fugro
|
2018-01-10 15:08:28 -05:00 |
|
Isaac Connor
|
a410706455
|
add a new daemon to do stat updates
|
2018-01-10 13:35:10 -05:00 |
|
Isaac Connor
|
f14859d7d0
|
Add ZM_STATS_UPDATE_INTERVAL
|
2018-01-10 13:20:24 -05:00 |
|
Isaac Connor
|
8186a17a86
|
reduce frequency of Server updating
|
2018-01-10 13:20:09 -05:00 |
|
Isaac Connor
|
4442c571fb
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-10 13:15:20 -05:00 |
|
Isaac Connor
|
4f6ab05e9e
|
Remove stats updating from zmwatch.pl.in, where it shouldn't be
|
2018-01-10 12:58:04 -05:00 |
|
Isaac Connor
|
cdbe1b9216
|
Only load SYs::MemInfo and Sys::CpuLoad if we are going to use them. Only start various services if they are turned on
|
2018-01-10 12:57:37 -05:00 |
|
Isaac Connor
|
146d56a6a0
|
fix missing }
|
2018-01-10 12:56:36 -05:00 |
|
Isaac Connor
|
e7d56d6bbf
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-09 13:36:04 -08:00 |
|
Isaac Connor
|
1db4d7df83
|
start work on Events_(Hour|Day|Month|etc) tables for the event count data
|
2018-01-09 16:35:28 -05:00 |
|
Isaac Connor
|
b420fde706
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-09 07:29:56 -08:00 |
|
Isaac Connor
|
e28b6c8b7c
|
When server is NULL, don't escape the NULL
|
2018-01-09 07:29:32 -08:00 |
|
Isaac Connor
|
b2fbd976cb
|
double the amount of time we wait for a process to end
|
2018-01-08 16:21:51 -05:00 |
|
Isaac Connor
|
e877fa1d61
|
make zmupdate_1.31.19 re-runable.
|
2018-01-08 14:49:57 -05:00 |
|
Isaac Connor
|
baa360cd3d
|
update event stat counts for all monitors at once
|
2018-01-07 14:20:17 -05:00 |
|
Isaac Connor
|
796ba0d899
|
revert to using the mysql client to do updates. We need it for delemiter changes when adding triggers
|
2018-01-04 17:16:43 -05:00 |
|
Isaac Connor
|
224e261ade
|
Don't run audit on default storage area. Add a test for an event having no endtime
|
2018-01-04 17:16:15 -05:00 |
|
Isaac Connor
|
68166719ca
|
Update the SQL that updates the monitor counts to be more efficient.
|
2018-01-04 17:15:46 -05:00 |
|
Isaac Connor
|
db0e35bf55
|
Move eventcounts update from zmwatch.pl to triggers and zmaudit.pl
|
2018-01-04 15:04:13 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
4e24e3647e
|
Also join the Storage table, and use it for ServerId instead of Monitors table.
|
2018-01-03 07:20:20 -08:00 |