ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,020 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

11020 Commits

Author SHA1 Message Date
Isaac Connor 7d2becee21 add reload on HUP 2018-01-10 12:59:42 -05:00
Isaac Connor 156bdbd089 Add zmstats, zmaudit, zmtrigger flags to Server object listing/editing 2018-01-10 12:59:27 -05:00
Isaac Connor ae5f4c9d9c Add log re-init on HUP 2018-01-10 12:58:22 -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 4908ca1732 add the zmstats.pl, etc to Servers instead of Stroage 2018-01-10 12:56:01 -05:00
Isaac Connor 92bc6d6c20 put back the .pl 2018-01-10 12:55:42 -05:00
Isaac Connor c6ae965b9c add Events_Archived and update triggers to update Archived and Total Events 2018-01-10 12:27:42 -05:00
Isaac Connor acd12d234a add Events_Archived table. Add zmstats, zmaudit and zmtrigger settings to Servers table to tell if we should run the services or not. Fix a missing backtick at Scheme 2018-01-10 12:26:59 -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 8cddf9b7a6 Merge branch 'storageareas' into tesla 2018-01-09 07:13:27 -08:00
Isaac Connor 4047d0ffc8 add No Server as an option is Server filter 2018-01-09 07:13:03 -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 2427a5bf63 sync up .service file to match 1604. 2018-01-08 16:13:11 -05:00
Isaac Connor 3e31203a22 default service start timeout to 5 minutes. THe default of 1.5 minutes is too short on some larger systems 2018-01-08 16:11:54 -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 348764985b Fix Storage DiskSpace updating when Event.DiskSpace IS NULL 2018-01-08 15:42:28 -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 727bde752f Count non-i frames in frames_to_keep. Should reduce the size of the packetqueue 2018-01-07 13:39:13 -05:00
Isaac Connor b25452d4c5 Don't both to add the Floreon control type. That can be done with zmcamtool 2018-01-05 15:47:28 -05:00
Isaac Connor 5c75df1a40 drop archived and Frames indexes from Events, as they are useless. Add a StorageId Index 2018-01-05 14:40:03 -05:00
Isaac Connor 37a40a30d3 drop archived and Frames indexes from Events, as they are useless. Add a StorageId Index 2018-01-05 14:39:54 -05:00
Isaac Connor 3ac73a9d6c switch to updating event counts for all monitors 2018-01-05 10:01:30 -08:00
Andrew Bauer 36ab7b01e8
Merge pull request #2018 from connortechnology/robots 
add a robots.txt to the docroot to tell bots to not scrape our ZM install
 2018-01-04 20:42:15 -06:00
Andrew Bauer da4d6d168d
Merge pull request #2022 from connortechnology/fix_Channel 
alter the type of the Channel field to match the update that occurred…
 2018-01-04 20:40:08 -06:00
Isaac Connor 9c00488ada Merge branch 'storageareas' into tesla 2018-01-04 14:23:30 -08:00
Isaac Connor b7ad24a266 revert the triggers to update Monitor Stats. THey just don't work 2018-01-04 17:22:51 -05:00
Isaac Connor 131e986e83 Merge branch 'storageareas' into tesla 2018-01-04 14:17:53 -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 023e50af5c Merge branch 'storageareas' into tesla 2018-01-04 10:09:24 -08:00
Isaac Connor 4033cf5ffc bump version to 1.31.19 with triggers 2018-01-04 13:07:02 -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 10133073de Check for SaveJPEGs being set to snapshot instead of hitting the fs to check for a snapshot file 2018-01-04 12:31:20 -05:00
Isaac Connor 2ec25a20ec Don't crash if we fail to open the video output stream 2018-01-04 10:07:51 -05:00
Isaac Connor cc773fe992 Merge branch 'storageareas' into tesla 2018-01-03 07:21:33 -08: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 7f44fb67e8 treat File exists as a non-error 2018-01-02 12:44:17 -08:00
Isaac Connor b8cfff2b6d Merge branch 'storageareas' into tesla 2018-01-02 09:18:29 -08:00