41 Commits

Author	SHA1	Message	Date
Isaac Connor	a9e2011727	Merge branch 'storageareas' into zma_to_thread	2019-02-13 12:24:38 -05:00
Isaac Connor	189e78b42d	add comments and a test for zm_terminate in the checkCommandQueue while loop	2019-01-21 13:29:20 -05:00
Isaac Connor	5ab1126260	Merge branch 'storageareas' into zma_to_thread	2018-10-20 17:31:14 -04:00
Andrew Bauer	c7f9ffa521	Merge pull request #2217 from connortechnology/touch_lockfile ... Touch lockfile	2018-10-11 08:45:09 -05:00
Isaac Connor	94796aea2c	Always make SWAP_PATH dir as under systemd it may be chrooted	2018-09-23 16:49:57 -04:00
Isaac Connor	c8549e41da	touch the zms lock file every hour so that we can determine which ones are stale	2018-09-21 15:58:14 -04:00
Isaac Connor	672b4affe1	Merge branch 'storageareas' into zma_to_thread	2018-08-31 19:05:22 -04:00
Isaac Connor	df3da6dd93	Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas	2018-08-30 14:53:39 -04:00
Isaac Connor	0eaa539dc6	ZM_SWAP_PATH may not exist, so always try to create it	2018-08-30 14:53:27 -04:00
Isaac Connor	979b31ffc3	Merge branch 'storageareas' into zma_to_thread	2018-08-11 10:08:30 -04:00
Isaac Connor	934ce654f9	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2018-06-08 15:21:43 -04:00
Isaac Connor	c3053a2f8a	Merge branch 'storageareas' into zma_to_thread	2018-05-10 17:51:38 -04:00
Andrew Bauer	7bc2c6dbc5	Downgrade Unable to send stream to warning ... Downgraded this from en Error to a Warning. This message can trigger following the normal closing of a monitor. Thus, it's not necessarily an error.	2018-05-04 12:04:28 -05:00
Isaac Connor	cd3046abb3	Merge branch 'storageareas' into zma_to_thread	2018-04-14 11:03:08 -04:00
Isaac Connor	0b0fbae1c5	Add output of paused image when paused	2018-04-12 18:43:57 -04:00
Isaac Connor	b974b4dcd1	google code style, and when paused, don't die after 10 seconds	2018-04-12 13:14:00 -04:00
Isaac Connor	989ed65f52	spacing and braces, remove a dead unused function	2018-04-11 10:50:28 -04:00
Isaac Connor	67b365948e	Merge branch 'storageareas' into zma_to_thread ... Conflicts: src/zm_ffmpeg_camera.cpp src/zm_monitor.cpp web/includes/Monitor.php web/skins/classic/views/js/add_monitors.js web/skins/classic/views/js/console.js	2018-01-29 15:53:26 -05:00
Isaac Connor	1d221dff7c	Frame throttling is not an error.	2018-01-29 11:45:33 -05:00
Isaac Connor	7e2f132cdd	Better debugging	2018-01-29 07:22:05 -08:00
Isaac Connor	190d8d1600	remove useless debug code	2018-01-28 15:17:41 -05:00
Isaac Connor	8e494ef431	Merge branch 'storageareas' into zma_to_thread	2017-11-23 08:40:49 -05:00
Isaac Connor	cd1d2e1721	lots more debugging. re-add status update command on failure	2017-11-22 01:18:07 -05:00
Isaac Connor	4d758b7ce9	debugging	2017-11-21 23:57:13 -05:00
Isaac Connor	24a0d717c5	wip	2017-11-21 19:55:40 -05:00
Isaac Connor	74650ebc70	simplify Analysis	2017-11-20 11:48:56 -05:00
Isaac Connor	ef5e296144	some fixes	2017-11-17 14:30:38 -05:00
Isaac Connor	2aa252fbd0	Merge branch 'storageareas' into zma_to_thread	2017-11-16 18:27:44 -05:00
Isaac Connor	d5962b11ff	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2017-11-14 02:48:38 -05:00
Isaac Connor	aee2b148f0	wip	2017-11-13 12:14:57 -05:00
Isaac Connor	495cd580aa	add more debugging	2017-11-02 11:45:49 -04:00
Isaac Connor	f0cfebe719	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2017-11-01 13:11:49 -04:00
Isaac Connor	ac9116e78b	add connkey to logging so I can tell which process is which	2017-11-01 12:01:12 -04:00
Isaac Connor	c9d52b47ba	add debug	2017-10-31 13:29:49 -07:00
Isaac Connor	ab1c9f7c98	add more debugging	2017-10-31 16:27:43 -04:00
Isaac Connor	eb48759ff8	wip	2017-10-27 13:37:51 -07:00
Isaac Connor	fece06c9e3	google code style	2017-10-19 17:12:36 -04:00
Isaac Connor	83f8a240d5	blah	2017-08-11 12:20:46 -04:00
Isaac Connor	49319990fa	Don't keep setting the event_file unnecessarily. Add some code comments	2017-07-26 10:38:18 -04:00
Isaac Connor	7a67a5e475	fix merge	2017-06-13 21:15:58 -04:00
Isaac Connor	42e94d1a7c	contains the MonitorStream class	2017-04-10 21:57:31 -04:00