4b78d85b14
build system - additional key phrases to filter on
2018-06-13 15:56:12 -05:00
4f26301ff0
filter build output to avoid travis build failures
...
Change the way we output our build text during travis builds. This commit will strip out lines with specific keywords.
2018-06-13 15:44:31 -05:00
4190b994b2
fix ftbs on el7 - Order matters. cinttypes must be included first
2018-06-13 12:18:34 -05:00
8cc72507ee
fix ftbs on el7
2018-06-13 11:30:14 -05:00
37badbfb17
fix #2123
2018-06-12 08:58:19 -04:00
fc456b3d5f
this file is now autogenerated
2018-06-11 16:34:44 -04:00
67155e98eb
add debug message when no changes are being made to a monitor
2018-06-11 16:34:40 -04:00
73555edfdc
Add Error message when a monitor has no server assigned in a multi-server setup
2018-06-11 16:34:23 -04:00
65a5af6f92
remove extra space
2018-06-11 15:49:39 -04:00
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
be26f14566
put back zmsystemctl.pl
2018-06-08 14:59:14 -04:00
374123f9c2
get rid of debugging and turn of extra logReInit
2018-06-08 14:21:27 -04:00
5cdbc85dcc
Slightly more efficient logPrint. Don't create the message string unless it is going to be used
2018-06-08 14:18:38 -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
d589d31f74
Merge branch 'master' into storageareas
2018-06-08 09:30:21 -04:00
e88c73195d
Merge branch 'fix_perl_logging' into storageareas
2018-06-08 09:30:16 -04: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
05a434893e
We should be able to edit zones even if zm isn't running
2018-06-06 16:59:07 -04:00
5b38585071
add a --daemon command line option to zmfilter.pl to tell it to run as a daemon even when --filter_id is specified.
...
Use this command line option in zmpkg.pl to make zmfilter.pl's stick around.
This reduces the impact of the memork leak in zmdc.pl
2018-06-06 14:05:58 -04:00
0937bfdf84
consoleTableBody needs to be an id in order for dragndrop sorting to work
2018-06-06 13:37:12 -04:00
2b00f1d166
Merge ../ZoneMinder.master into storageareas
2018-06-06 13:06:41 -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
794c6b641c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-06-04 14:59:56 -04:00
627ee8aeb3
close syslog in order to not leak ram
2018-06-04 14:59:42 -04:00
Andrew Bauer
Isaac Connor
Isaac Connor