979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
3962c52288
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-09 11:23:37 -04:00
683789eb41
Merge branch 'master' into storageareas
2018-08-03 10:27:48 -04:00
82833a152e
exit on HUP to free up memory.
2018-08-02 06:53:18 -04:00
50c7eec0ff
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-02 05:25:53 -04:00
6ad732e419
retrieve greip data rather than the ip ( #2173 )
2018-07-31 14:01:01 -04:00
48b91c5544
Bugfix in Control and added new Camera ( #2171 )
...
* fixed control typos
missing word "s" for "Controls" Table for database queries
* added Dericam P2 camera Control
* fixed missing CanReset column
* Update DericamP2.pm
* added some more missing controls
CanSleep, CanWake
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update zm_create.sql.in
2018-07-28 09:26:02 -04:00
26d6b99018
Added new control script for iPhone ip camera software ( #2161 )
...
https://itunes.apple.com/ca/app/ipcamera-high-end-network-camera/id570912928?mt=8
See https://forums.zoneminder.com/viewtopic.php?f=9&t=27386 for details.
2018-07-17 08:09:15 -04:00
455204135d
fail if zm_path_ffmpeg not set
2018-07-17 06:57:38 -05:00
d3034670a0
Merge branch 'master' into storageareas
2018-07-10 11:03:33 -04:00
756369f2d8
JSON::Any --> JSON::MaybeXS ( Closes : #770 ). ( #2151 )
2018-07-10 10:27:03 -04:00
add3682128
fix spelling
2018-07-05 08:00:24 -05:00
e98a4b1562
Merge branch 'master' into storageareas
2018-06-25 14:31:00 -04:00
c285d5ebb1
spacing. Add code to delete events that huse the deep storage scheme and have lost their symlinks.
2018-06-25 13:41:19 -04:00
422d2d6dba
set telemetry default to NO
...
This is the first step for GDPR compliance. A future pr will add a prompt which explains what the telemetry pr is for and whether they want to turn it on.
2018-06-22 08:10:48 -05:00
fd72689182
Spacing, quotes. Main thing is to delete Object cache on HUP
2018-06-21 10:49:51 -04:00
3cb5ef6a94
Spacing
2018-06-21 10:00:54 -04:00
3ffd30ffbd
Allow selection of different source column filtering on the console ( #2132 )
2018-06-20 11:12:43 -04:00
a594a1b6f1
Merge branch 'master' into storageareas
2018-06-15 09:45:11 -04:00
fef88107e1
Close the db before forking in start()
2018-06-14 14:54:00 -04:00
65a5af6f92
remove extra space
2018-06-11 15:49:39 -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
934ce654f9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-06-08 15:21:43 -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
be61c50efa
Fix setting Debug option when ZM_LOG_DEBUG_TARGET is empty and fix setting effectiveLevel
2018-06-07 17:25:02 -04:00
20bef5f381
Remove unused Server loading and debug statements
2018-06-07 09:57:54 -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
2b00f1d166
Merge ../ZoneMinder.master into storageareas
2018-06-06 13:06:41 -04:00
b3c9f508f4
Remove debugging line that is causing systemd to fail
2018-06-06 11:40:12 -04:00
627ee8aeb3
close syslog in order to not leak ram
2018-06-04 14:59:42 -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
c98339e152
Google code style, list monitor in debug line listing LastWriteTime
2018-05-24 10:49:20 -04:00
Isaac Connor
Andrew Bauer
Roman Dissertori
Daedilus
Dmitry Smirnov
Andrew Bauer
Isaac Connor
Isaac Connor