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 |
|
Isaac Connor
|
485741b6f7
|
treat File exists as a non-error
|
2018-01-02 12:44:47 -08:00 |
|
Isaac Connor
|
867f2a9166
|
simplify deleting event files. The old way was too intensive.
|
2018-01-02 09:15:50 -08:00 |
|
Isaac Connor
|
16f01d5ecb
|
Fix when specifying by filter_id or filter_name. Probably a botched merge.
|
2018-01-02 07:10:38 -08:00 |
|
Isaac Connor
|
7fcbd86ba0
|
fix auditing Medium directory structures
|
2017-12-29 15:29:57 -05:00 |
|
Isaac Connor
|
148e21d707
|
fugro
|
2017-12-21 21:46:21 -05:00 |
|
Isaac Connor
|
f036e95793
|
fix Moving when Medium Scheme
|
2017-12-21 16:53:22 -08:00 |
|
Isaac Connor
|
2922a86d23
|
fixes to new Storage Schemes code
|
2017-12-19 11:01:03 -05:00 |
|
Isaac Connor
|
dcfae11fc7
|
fix typos
|
2017-12-18 13:16:54 -05:00 |
|
Isaac Connor
|
d312482a2b
|
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
|
2017-12-18 12:52:26 -05:00 |
|
Isaac Connor
|
eebc7ce856
|
code doc
|
2017-12-12 11:16:17 -05:00 |
|
Isaac Connor
|
f64d65e6d7
|
Make db errors not fatal when deleting an event
|
2017-12-12 10:55:09 -05:00 |
|
Isaac Connor
|
bd73e7c2e2
|
Merge branch 'robots' into storageareas
|
2017-12-07 10:31:25 -05:00 |
|
Isaac Connor
|
e7a43b2618
|
fix, don't set the storage path to NULL
|
2017-12-06 10:11:59 -08:00 |
|
Isaac Connor
|
073b055b4c
|
fix Event Moving
|
2017-12-05 10:21:43 -08:00 |
|
Isaac Connor
|
b1a887dbd8
|
fixes to move Event
|
2017-12-05 10:02:21 -08:00 |
|
Isaac Connor
|
82bed8f3fa
|
actually delete the old files when we move an event
|
2017-12-05 08:43:13 -08:00 |
|
Isaac Connor
|
203fe79391
|
cleanup debug
|
2017-12-04 11:14:55 -05:00 |
|
Isaac Connor
|
1ccd344bf5
|
implement Storage Area move
|
2017-12-04 11:05:50 -05:00 |
digital-gnome
|
0a995aea78
|
Add navbar refresh to all pages that use it
|
2017-11-30 16:33:46 -05:00 |
|
Isaac Connor
|
c2ff010d27
|
Support NULL in date/time values
|
2017-11-27 10:04:08 -08:00 |
|
Isaac Connor
|
4b92a788f7
|
fix filter execute
|
2017-11-24 15:37:50 -05:00 |
|
Isaac Connor
|
485567349d
|
Don't calc DiskSpace if it is already defined
|
2017-11-23 07:29:05 -08:00 |
|
Isaac Connor
|
9d6b417b60
|
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
|
2017-11-22 17:03:37 -08:00 |
|
Isaac Connor
|
cd1d2e1721
|
lots more debugging. re-add status update command on failure
|
2017-11-22 01:18:07 -05:00 |
|
Isaac Connor
|
bf6312a8ec
|
put back zma
|
2017-11-21 23:56:05 -05:00 |
|
Isaac Connor
|
489d3ba6ed
|
Merge ../ZoneMinder.master into storageareas
|
2017-11-21 12:23:17 -05:00 |
|
Isaac Connor
|
95c19fa674
|
Make zmaudit check for a pid file and not running if it exists
|
2017-11-20 11:55:42 -05:00 |
Ognyan Bankov
|
ded6b1864a
|
2006 support floureon 1080p 18x 30x (#2007)
* perl control script for Fluoreon 1080p
* DB update for Floureon cameras support
|
2017-11-18 19:02:23 -05:00 |
|
Isaac Connor
|
09a715a99f
|
prevent a warning
|
2017-11-18 09:41:37 -05:00 |
APHW2 MFGENG
|
2ffa79172a
|
Only load Name,Value when loading config because that's all we use
|
2017-11-06 08:36:53 -08:00 |
|
Isaac Connor
|
31b756bd53
|
add missing tests for StartDateTime etc
|
2017-11-03 07:18:30 -04:00 |
|
Isaac Connor
|
cb01b96dc0
|
fixes
|
2017-11-01 12:01:11 -07:00 |
|
Isaac Connor
|
ae8bfadcf7
|
use static logging method
|
2017-10-27 21:13:14 -07:00 |
|
Isaac Connor
|
b3d65729da
|
apache style logging function take a logging object
|
2017-10-27 21:13:01 -07:00 |
Isaac Connor
|
2003798e64
|
copy in start and end transaction
|
2017-10-27 21:06:11 -07:00 |
|
Isaac Connor
|
2d6998ad25
|
fix debug_all
|
2017-10-27 20:54:54 -07:00 |
|
Isaac Connor
|
2d8a4794de
|
add save, set, transform, and some globals pointing to dbh and log
|
2017-10-27 20:54:29 -07:00 |
|
Isaac Connor
|
8b4468caed
|
add apache log style aliases
|
2017-10-27 20:54:19 -07:00 |
|
Isaac Connor
|
663cc6df87
|
improve logging of zmfilter
|
2017-10-27 09:09:12 -07:00 |
|
Isaac Connor
|
82fbec697f
|
add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid
|
2017-10-27 08:37:53 -07:00 |
|
Isaac Connor
|
e27b95c820
|
make zmfilter update DiskSPace. ALso rename DiskUsage in Event to DiskSpace
|
2017-10-27 08:05:35 -07:00 |
|
Isaac Connor
|
653d213d62
|
Add EndTime and DiskSpace to Filters
|
2017-10-25 11:11:19 -07:00 |
|
Isaac Connor
|
3c0be45eb8
|
have zmdc.pl update the Servers table with system status information
|
2017-10-24 15:13:48 -07:00 |
|
Isaac Connor
|
6c03ae32c2
|
add code to update the statuses in the Server record every second. This code also reduces the timeout from .1 seconds to 1 second. Should reduce load by zmdc on low power devices. I see no reason to poll that heavily...
|
2017-10-24 12:31:23 -07:00 |