Commit Graph

1326 Commits

Author SHA1 Message Date
Isaac Connor 052807aaf5 remove extra my 2017-01-15 10:57:39 -05:00
Isaac Connor c79dfb6a16 fix typos 2017-01-15 10:56:57 -05:00
Isaac Connor 4973d8c74c add support for connect options 2017-01-15 10:54:46 -05:00
Isaac Connor d24d151f53 Slurp db update file in and do() it instead of calling mysql 2017-01-15 10:54:23 -05:00
Isaac Connor ed5c3c4ed4 remove debug stautement 2017-01-12 12:58:09 -05:00
Isaac Connor d9ce1a68c6 restore defaults 2017-01-12 12:56:55 -05:00
Isaac Connor e94a797a5e remove debug stautement 2017-01-12 12:56:20 -05:00
Isaac Connor 65f7350313 remove debug stautement 2017-01-12 12:55:27 -05:00
Isaac Connor 82eaacc624 switch quotes 2017-01-12 12:54:46 -05:00
Isaac Connor 42484f7680 switch quotes, load monitors at the beginnign 2017-01-12 12:54:40 -05:00
Isaac Connor 0197c550ae Use a real variable for file handle so that it sticks around 2017-01-12 12:54:14 -05:00
Isaac Connor 0f67d9847e remove caching of verified status of an mmap. 2017-01-12 12:53:57 -05:00
Isaac Connor 04f66917ae Merge branch 'fix_mmap_leak' into storageareas 2017-01-10 15:29:54 -05:00
Isaac Connor 7ddd5359d0 zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good 2017-01-10 15:09:30 -05:00
Isaac Connor a146d7bee1 add a test for valid in the shared data. zmc sets this to false when it closes properly 2017-01-10 15:08:49 -05:00
Isaac Connor faeb785961 zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good 2017-01-10 15:08:23 -05:00
Isaac Connor 4d84387807 Merge branch 'fix_mmap_leak' into work 2017-01-10 14:22:58 -05:00
Isaac Connor a66e9e45a2 merge a fix from storageareas that adds a test for the shared data being valid and reloads the monitors if it can't reconnect 2017-01-10 14:22:42 -05:00
Isaac Connor d2ff6701f4 test 2017-01-10 13:53:02 -05:00
Isaac Connor b3c5f4622f revert knnniggett's zmMemDetach changes 2017-01-10 12:56:19 -05:00
Isaac Connor 3074263e06 Merge branch 'control_fixes' into storageareas 2017-01-10 12:54:46 -05:00
Isaac Connor 66cdcd95fa Merge branch 'master' into fix_mmap_leak 2017-01-10 08:47:46 -05:00
Isaac Connor 99e823ef33 Merge branch 'zmtelemetry_improvements' into storageareas 2017-01-08 11:04:59 -05:00
Isaac Connor 27760ffce2 move pod below __END__ and improve it to include options. Add help option. 2017-01-08 10:12:25 -05:00
Isaac Connor b3a07c27b8 Add test for lastCheck being in the future. print out a notice when we are sleeping and are being run from a terminal. 2017-01-08 09:40:09 -05:00
Isaac Connor 146a772a21 move ENDPOINT to hidden category 2017-01-06 19:49:03 -05:00
Isaac Connor 03b19bc1fd when run from terminal, output a line that says that we are sleeping 2017-01-06 18:40:39 -05:00
Isaac Connor 7f2fcddc03 revert print to Info 2017-01-06 18:39:08 -05:00
Isaac Connor 426eabb12d if running from a terminal, set termLevel to info 2017-01-05 11:24:53 -05:00
Isaac Connor db1a6f9b3b fix to remove qqq 2017-01-05 11:24:27 -05:00
Isaac Connor 75cd1de7ab show the # of entries loaded and saved 2017-01-05 09:42:11 -05:00
Isaac Connor 0c34aa9830 Merge branch 'zmtelemetry_improvements' into storageareas 2017-01-04 12:25:01 -05:00
Isaac Connor 09783a1a39 add some command line options and use the INTERVAL and ENDPOINT from the Config hash 2017-01-04 12:22:40 -05:00
Isaac Connor cf9747054c add ZM_TELEMETRY_INTERVAL AND ENDPOINT 2017-01-04 12:22:01 -05:00
Isaac Connor 84183c819c Merge branch 'master' into storageareas 2017-01-03 09:53:09 -05:00
Isaac Connor 2a1ec2beb1 Merge pull request #1719 from knnniggett/hikvisionptz
Add HikVision ptz control sciprt
2017-01-03 08:59:56 -05:00
Isaac Connor ac88490338 When use warnings is on and there is a null value in the monitor data it causes warnings. So add skip if __git_main is not defined. 2017-01-02 12:49:37 -05:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer 25ab1bee18 more fixed to gpl license text 2016-12-26 10:40:09 -06:00
Andy Bauer 0f15b3ae62 update gpl 2 mailing address 2016-12-26 10:33:03 -06:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor ed46a6b6ac must call zmMemInvalidate before next 2016-12-23 09:27:54 -05:00
Isaac Connor 631c13ab1a revert to zmMemInvalidate 2016-12-23 09:26:38 -05:00
Isaac Connor 98a3d8f9f2 remove <<<< line 2016-12-22 11:02:07 -05:00
Isaac Connor c27d0270dc Merge branch 'knnniggett-zmMemDetach' into storageareas 2016-12-20 15:40:14 -05:00
Andy Bauer c6368c4a1a replace zmMemInvalidate with zmMemDetach 2016-12-20 13:49:07 -06:00
Isaac Connor ed618ff7b0 Merge branch 'master' into storageareas 2016-12-20 11:29:31 -05:00
Andrew Bauer 02e534dcff Merge pull request #1694 from connortechnology/disk_space_in_events
Disk space in events
2016-12-20 09:19:21 -06:00
Isaac Connor 1bf93d76b7 fix www and parenthesis. 2016-12-13 14:56:29 -05:00
Isaac Connor 6ceb4cc93e fix qqq and replace doube quotes with single quotes 2016-12-13 14:32:28 -05:00