Commit Graph

1585 Commits

Author SHA1 Message Date
Isaac Connor 274e8e982c Merge branch 'storageareas' into tesla 2018-01-18 08:42:12 -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 ad8c775507 Only update db record if there is a change in diskspace 2018-01-17 12:53:23 -08:00
Isaac Connor 20962cda0d Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-16 18:45:28 -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 e78a40b45f Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-16 11:02:20 -08:00
Isaac Connor aaa6c5cccb Only delete files if no error 2018-01-16 14:01:26 -05:00
Isaac Connor b09bb528a5 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-16 08:42:41 -08: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 Connor 90d7fee8bb use last, not break 2018-01-11 19:14:37 -08:00
Isaac Connor ef16393402 Merge branch 'storageareas' into tesla 2018-01-11 18:59:22 -08: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 5db4180327 Better logging, test for path existence before DiskSpace update. Fix delete_files when moving 2018-01-09 13:21:15 -08:00
Isaac Connor 80f0515eae break after sending kill 2018-01-09 09:15:55 -08: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 d8323a4dac When server is NULL, don't escape the NULL 2018-01-09 07:28:57 -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 f73ead3f33 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-08 12:44:54 -08: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 3ac73a9d6c switch to updating event counts for all monitors 2018-01-05 10:01:30 -08: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