6ad10a5b73
Correct Load to CpuLoad in Servers
2018-06-11 15:49:23 -04:00
a4ade03e6f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-06-11 14:08:19 -04:00
d1f658bf30
minor spacing changes, remove unused Server lookup
2018-06-11 14:07:49 -04:00
48f8118e5a
put back logReInit
2018-06-10 15:01:20 -04:00
578efb3a76
Need to do reaper in shutdownALl
2018-06-10 14:21:09 -04:00
982f5e2442
fix typo
2018-06-10 12:15:26 -05:00
9da5759063
Merge pull request #2117 from connortechnology/simplify_reaper
...
rework reaper
2018-06-09 20:20:07 -05:00
c7a85e37f8
rework reaper making it simply add the pid and status data into a hash of children to reap and due the reaping/restarting in the main loop.
2018-06-09 18:52:01 -04:00
f5f4649886
Fix #2100
2018-06-08 15:14:11 -04:00
524c18eb4c
Don't print to STDERR when can't log to db and recheck hasTerm on logging reinit
2018-06-08 15:13:48 -04:00
74a44869cf
Merge pull request #2116 from connortechnology/fix_perl_logging
...
when detecting a down db connection, need to clear the stored sth as …
2018-06-08 08:44:22 -05:00
d30d8efaf0
clear stored sth on initialize and re-initialize
2018-06-08 09:17:25 -04:00
7c32e4d86c
Move zmDbConnect up before logInit because the db handle got closed
2018-06-08 09:15:19 -04:00
fc0369b9a4
when detecting a down db connection, need to clear the stored sth as it is no longer valid.
2018-06-08 09:04:31 -04:00
61445620aa
create the pid file before doing anything else ( #2114 )
...
* create the pid file before doing anything else
* update comment
2018-06-08 08:53:23 -04:00
5f35f481c5
Merge pull request #2115 from connortechnology/fix_perl_logging
...
Fix perl logging
2018-06-07 18:24:23 -05:00
63ede25647
Merge branch 'fix_perl_logging' of github.com:ConnorTechnology/ZoneMinder into fix_perl_logging
2018-06-07 17:26:53 -04:00
be61c50efa
Fix setting Debug option when ZM_LOG_DEBUG_TARGET is empty and fix setting effectiveLevel
2018-06-07 17:25:02 -04:00
aa055c147b
classic skin - fix dvr control buttons
...
The buttons were being drawn too small which cropped the symbols inside the buttons. Deleting the classic-skin-specific override of the css file allows the default css to apply which looks good to me.
2018-06-07 14:32:36 -05:00
0937bfdf84
consoleTableBody needs to be an id in order for dragndrop sorting to work
2018-06-06 13:37:12 -04:00
9050ffaf92
spacing, remove some debug lines
2018-06-06 12:57:35 -04:00
cd64619743
Fix controlling daemon when the monitor is Local
2018-06-06 12:56:33 -04:00
3109536dda
Alternate fix for video generation under csrf. Now we just turn off output buffering (discarding contents before sending the avi
2018-06-06 11:55:51 -04:00
2aac2e1e05
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-06-06 11:41:36 -04:00
b4e0cb5eab
WHen we are storing jpgs we don't generate a snapshot, so handle that
2018-06-06 11:41:28 -04:00
d961b74084
spacing and double to single quotes
2018-06-06 11:41:00 -04:00
db6bd67f59
just fix structure/spacing
2018-06-06 11:40:38 -04:00
b3c9f508f4
Remove debugging line that is causing systemd to fail
2018-06-06 11:40:12 -04:00
798d046d81
Remove some debugging lines
2018-06-06 11:39:41 -04:00
c30992be3f
fixes #2105
...
A more simplified approach to fixing #2105 , compared to previous attempts.
2018-06-06 08:18:33 -05:00
a25f5f1b12
don't call Debug after select
...
This line was causing havoc when starting up zoneminder.
2018-06-05 09:43:40 -05:00
b071aaad7b
Merge pull request #2111 from connortechnology/recursive_mutex
...
Implement a RecursiveMutex class which is an explicit Recursive Mutex…
2018-06-02 17:30:21 -05:00
5d772f16f6
fix closing td
2018-06-01 16:18:07 -04:00
db422dc3ce
Merge ../ZoneMinder.connortechnology
2018-06-01 11:29:20 -04:00
87d9fc447e
google code style
2018-06-01 11:27:53 -04:00
316dbb5eb8
Implement a RecursiveMutex class which is an explicit Recursive Mutex. Change the db mutex to a recursive Mutex
2018-06-01 11:27:35 -04:00
8559dce350
rpm readme - mention changes to apache config file
2018-06-01 08:51:53 -05:00
00ace16b61
bump zoneminder rpm specfile
2018-05-31 13:54:33 -05:00
405b1f92ed
add a .fail to log the errors given when a navbar ajax call fails
2018-05-31 10:25:53 -04:00
21e26c8c14
Spacing and parenthesis and some debug lines
2018-05-31 10:25:16 -04:00
2eb3c8ef6d
use a stored prepared sth instead of re-preparing it
2018-05-31 10:24:54 -04:00
e831c1563d
pretty the code structure
2018-05-24 10:59:26 -04:00
b7129578c1
fix case where pre_event_count=0 and analysis_fps is set because there are no pre_event_buffers
2018-05-24 10:59:15 -04:00
c98339e152
Google code style, list monitor in debug line listing LastWriteTime
2018-05-24 10:49:20 -04:00
af3ce3660f
Only unlink if file exists, removing warning. Always return a Storage object in Monitor->Storage() fixes Monitor Delete.
2018-05-24 09:54:45 -04:00
13e11a1e7f
Fix potention div vy zero
2018-05-22 15:52:12 -04:00
dc5ccd04ef
Update thumbnail with high scoring image.
2018-05-22 11:31:03 -04:00
be424f46f0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-18 12:07:22 -04:00
77b144a13e
must specify type=button or else some browsers treat it as a submit button
2018-05-18 16:07:58 +02:00
337db8bb18
Include Content-Length so we get a download progress
2018-05-18 15:52:30 +02:00
Isaac Connor
Isaac Connor
Andrew Bauer
Isaac