Commit Graph

10606 Commits

Author SHA1 Message Date
Isaac Connor a60da6811b revert adding custom port for status updates. It breaks in the non-multiserver case. 2018-01-29 15:17:22 -05:00
Isaac Connor 6acb555c52 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-01-29 10:42:23 -08:00
Isaac Connor d19b8bc5cf add default value for ServerId in new Storage Object 2018-01-29 10:41:59 -08:00
Isaac Connor 06673019f9 add default values for zmstats, zmaudit, zmtrigger in new Server 2018-01-29 10:41:43 -08:00
Isaac Connor 31b7deb101 Return NULL on error in dbQuery 2018-01-29 10:41:24 -08:00
Isaac Connor c9e32fb344 Check for successful Monitor db Insertion 2018-01-29 10:41:09 -08:00
Isaac Connor e638817cb9 Check for ServerId exists in MonitorObject 2018-01-29 10:40:50 -08:00
Isaac Connor 1d221dff7c Frame throttling is not an error. 2018-01-29 11:45:33 -05:00
Isaac Connor 7074681e60 Need drop permissions 2018-01-29 11:44:29 -05:00
Isaac Connor 525749c11a Need drop permissions 2018-01-29 11:44:03 -05:00
Isaac Connor 8979f14314 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-29 11:29:33 -05:00
Isaac Connor a76fcb331c Remove debugging. Treat can't get semaphore as a non-error 2018-01-29 08:25:46 -08:00
Isaac Connor 73d84c6b08 fix typo 2018-01-29 07:53:48 -08:00
Isaac Connor 4751920423 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-29 07:49:38 -08:00
Isaac Connor 35cda5cf17 Merge sjc04p1fviap02:ZoneMinder into storageareas 2018-01-29 07:45:55 -08:00
Isaac Connor a490c0e5bf Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-01-29 07:45:37 -08:00
Isaac Connor a782ef1db7 Add debug tests for loading all events 2018-01-29 07:45:28 -08:00
Isaac Connor e672841a8d Add remote server port to monitor url 2018-01-29 07:42:43 -08:00
Isaac Connor bfbd033971 Fix getting stream status updates when # of files open is > 1024. 2018-01-29 07:41:29 -08:00
Isaac Connor c89d4e424e Add error check for no Storage Areas found for this server 2018-01-29 07:40:37 -08:00
Isaac Connor 7eaa0180e5 Better debugging 2018-01-29 07:38:24 -08:00
Isaac Connor 03122b9015 add onFailure logger, and change link to chain so that responses don't just disappear 2018-01-29 07:38:02 -08:00
Isaac Connor fc4edefd81 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-29 07:35:24 -08:00
Isaac Connor dc6842bfbd Add remote server port to monitor url 2018-01-29 07:32:40 -08:00
Isaac Connor b793e6659b add onFailure logger, and change link to chain so that responses don't just disappear 2018-01-29 07:32:02 -08:00
Isaac Connor 984d3a2dd1 add Monitor Name to the response listing the available camera feeds 2018-01-29 07:30:46 -08:00
Isaac Connor 0b2d752ea4 Use chosen on the MonitorIds select. 2018-01-29 10:29:59 -05:00
Isaac Connor 8c4a786114 Move status fields out of the object fields 2018-01-29 10:27:46 -05:00
Isaac Connor 7e2f132cdd Better debugging 2018-01-29 07:22:05 -08:00
Isaac Connor b1b8b42f2b Fix getting stream status updates when # of files open is > 1024. 2018-01-29 07:21:31 -08:00
Isaac Connor cfb0461fcf Rename column Id to MonitorId in MonitorStatus 2018-01-29 09:31:43 -05:00
Isaac Connor 0e58920d2a Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-29 06:30:43 -08:00
Isaac Connor ff12495364 bump version for column rename in Monitor_Status 2018-01-29 09:28:19 -05:00
Isaac Connor 2dcb0d183f Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-28 18:07:33 -08:00
Isaac Connor f2b335c7b2 SORT auto server selection in ascending order 2018-01-28 18:07:01 -08:00
Isaac Connor 51d5fd38aa scan the board for the names of the camera inputs 2018-01-28 18:06:13 -08:00
Isaac Connor f132a7681d Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla 2018-01-28 18:05:29 -08:00
Isaac Connor c59751713b fix redirect 2018-01-28 17:31:00 -05:00
Isaac Connor 0d734a880c add hack to ensure that next and previous operate on time 2018-01-28 17:30:49 -05:00
Isaac Connor f98217e62a remove useless debug code 2018-01-28 15:17:48 -05:00
Isaac Connor 190d8d1600 remove useless debug code 2018-01-28 15:17:41 -05:00
Isaac Connor 748f78d7a6 clean out old threaded code that has been #defined out for a long time. When EOF, after re-opening, continue instead of logging the error 2018-01-28 15:17:22 -05:00
Isaac Connor 057509637a TUrn a warning into a debug 2018-01-28 15:16:06 -05:00
Isaac Connor 16c24240f7 clean out old threaded code that has been #defined out for a long time. When EOF, after re-opening, continue instead of logging the error 2018-01-28 15:14:38 -05:00
Isaac Connor 8a4b17fb50 turn into a url instead of boolean. Use it to refresh the options page on change so that changes are instantly noticable 2018-01-28 15:13:57 -05:00
Isaac Connor 5d4fde88d9 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-27 12:17:13 -08:00
Isaac Connor bc6d8623a6 add a semaphore around the socket creation and retention. I think concurrent processes are messing with the sockets. 2018-01-27 15:03:22 -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