Isaac Connor
8e053aa04b
Merge branch 'master' into storageareas
2018-10-10 14:51:52 -04:00
Andrew Bauer
2fbe1be02b
implement loadMonitor sub ( #2244 )
...
* implement loadMonitor sub
* remove carriabe returns from Info, Warning, Debug statements
2018-10-10 14:27:05 -04:00
Isaac Connor
b84234cdf1
Remove debug line at INF level
2018-10-10 14:22:48 -04:00
Isaac Connor
1958351a13
Merge branch 'master' into storageareas
2018-10-09 10:24:24 -04:00
Andrew Bauer
c1de20a081
use $Event rather than $event ( #2240 )
2018-10-08 09:25:17 -04:00
Isaac Connor
4a642e1a9d
pass Event instead of event to executeCommand
2018-10-08 08:31:16 -04:00
Isaac Connor
9275a1d046
fix missing spaces after 'to' and some spacing and quotes
2018-10-05 09:45:47 -04:00
Isaac Connor
56b31becb2
Add explicit db disconnect in Fatal(). If we don't disconnect then we leave sockets hanging around in TIME_WAIT (I think).
2018-10-04 10:47:38 -04:00
Isaac Connor
015890a509
Merge branch 'master' into storageareas
2018-10-02 15:27:12 -04:00
Isaac Connor
c94367c7ad
The uploadArchFile takes an Event object now
2018-09-29 08:32:57 -04:00
Isaac Connor
33bd30fbbd
Merge branch 'master' into storageareas
2018-09-28 13:40:18 -04:00
Andrew Bauer
b533c8b257
don't zmMemInvalidate when reloading monitors ( #2225 )
...
* remove call to zmMemVerify when reloading monitors
* need to call zmMemVerify to attach to the mem handle
2018-09-28 13:35:42 -04:00
Isaac Connor
d45406bce7
ode style and some more debug
2018-09-28 11:50:34 -04:00
Isaac Connor
e6f366c5cb
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-09-28 09:48:37 -04:00
Isaac Connor
e0dc8a5f6b
Merge branch 'master' into storageareas
2018-09-27 13:54:53 -04:00
Isaac Connor
66f11435b9
perhaps fix memory corruption due to libx264 writing to stderr which may be closed.
2018-09-27 13:50:11 -04:00
Isaac Connor
8f6db1c279
Merge branch 'master' into storageareas
2018-09-25 13:54:44 -04:00
Isaac Connor
5fd1034b0b
Add ServerId to perl Logging to DB
2018-09-25 13:53:50 -04:00
Isaac Connor
af69dab9c5
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-09-22 14:58:28 -04:00
Isaac Connor
5dba17e1fc
Merge branch 'master' into storageareas
2018-09-21 10:50:10 -04:00
Isaac Connor
3f0336e63e
Fix event_id detection from link (re was wrong). Add extra check for db event when we find an event dir without identifying id info in Deep mode
2018-09-21 10:31:54 -04:00
Isaac Connor
6aa71dfc11
Fix calculation of LinkPath, as it was using RelativePath instead of Path
2018-09-21 10:31:11 -04:00
Isaac Connor
a568948eab
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-20 12:31:36 -04:00
Isaac Connor
884eb48420
fix the section that deletes events that have lost their event links.
2018-09-20 12:31:19 -04:00
Jonathan Lassoff
c7e1e7b901
Control plugin for Dahua PTZ cameras ( #2192 )
...
* Control plugin for Dahua PTZ cameras
* Update http/https protocol handling
* Update doc and license
* Remove license from top of file
* Use named regex capture groups for ControlAddress parsing
* Remove trailing whitespace in Trendnet.pm
2018-09-20 12:29:54 -04:00
Isaac Connor
7abe4c40d5
Merge branch 'fix_2213' into storageareas
2018-09-19 20:02:27 -04:00
Isaac Connor
95bcac4c5a
Implement delete_empty_subdirs that uses delete_empty_directories. The idea is to use it on the monitor dir so that the monitor dir gets left behind and not deleted when there are no events
2018-09-19 20:00:26 -04:00
Isaac Connor
3a9f96e8e8
Skip deleting event if event is archived. And event not having a scheme is now an error
2018-09-19 12:03:51 -04:00
Isaac Connor
34c7ee32ee
Merge branch 'master' into storageareas
2018-09-14 15:13:57 -04:00
Isaac Connor
f2a117c85b
fix undefined $event
2018-09-14 11:06:08 -04:00
Isaac Connor
4528a043c5
fixtypo
2018-09-14 11:04:52 -04:00
Isaac Connor
ca3fd5ddf8
get rid of deleteEventFiles function. People should use the object method
2018-09-14 10:08:35 -04:00
Isaac Connor
11137d271e
Create utility functions in event for creating linkPath and idPath. Replace the code in Generate::createEventPath with using these nice new functions
2018-09-14 10:06:36 -04:00
Isaac Connor
63bed3af10
replace all uses of getEventPath with object function event->Path(). Remove getEventPath
2018-09-14 09:23:09 -04:00
Isaac Connor
60b952ab86
Merge branch 'master' into storageareas
2018-09-13 16:20:36 -04:00
Jonathan Lassoff
7bcf9d59e1
Use named regex capture groups.
2018-09-12 12:55:31 +00:00
Isaac Connor
684f48979a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-11 14:30:19 -04:00
Isaac Connor
b545528bb0
If DefaultVideo is set, use the passthrough mp4 instead of generating and mp4 from jpegs
2018-09-11 08:49:42 -04:00
Isaac Connor
042d4c3099
Default to auditing all Storage Areas. Add a Server flag to audit only areas on a specific server.
2018-09-09 18:32:00 -04:00
Isaac Connor
5eec7e00c5
Merge branch 'master' into storageareas
2018-09-09 14:09:52 -04:00
Isaac Connor
882e47c9ab
Fix deleting empty directories
2018-09-09 13:28:24 -04:00
Isaac Connor
9e8a876101
Fix finding Storage by ServerId
2018-09-09 13:28:11 -04:00
Isaac Connor
e4c87ce256
Merge branch 'master' into storageareas
2018-09-09 11:36:52 -04:00
Isaac Connor
fa690826a3
clean up zmstats, add db reconnect
2018-09-07 16:30:47 -04:00
Isaac Connor
b7aa11f109
Fix infinite loop reconnecting to db in Logging
2018-09-07 16:30:24 -04:00
Isaac Connor
def72b8e66
tidy up license
2018-09-07 16:29:59 -04:00
Isaac Connor
426aeea95b
add db reconnects to zmwatch.
2018-09-07 16:29:23 -04:00
Isaac Connor
4b69f520d5
Merge branch 'master' into storageareas
2018-09-05 12:08:23 -04:00
Isaac Connor
730e1fda37
We only use File::Slurp when moving files to s3fs so only require it if doing that
2018-09-05 10:14:45 -04:00
Isaac Connor
c34f899d31
eliminate warning when no Storage area is set.
2018-09-04 13:57:35 -04:00
Isaac Connor
8245d193e2
Merge branch 'master' into storageareas
2018-09-04 09:48:47 -04:00
Andrew Bauer
13558b2c12
convert existing http urls in help text to markdown
2018-09-04 07:39:46 -05:00
Jonathan Lassoff
4deaa49048
Remove license from top of file
2018-09-04 10:48:28 +00:00
Andy Bauer
ce48343d1a
embed link to privacy statment in telemetry help text
2018-09-03 13:55:11 -05:00
Isaac Connor
f4c2d8adea
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-03 12:29:09 -04:00
Jonathan Lassoff
b3a0b0e731
Update doc and license.
2018-09-03 14:08:59 +00:00
Jonathan Lassoff
a3baf2c371
Update protocol selection handling
2018-09-03 14:08:52 +00:00
Jonathan Lassoff
2074e1ccc3
use strict and remove base class methods
2018-09-03 13:51:33 +00:00
Isaac Connor
b1fe80a0bd
Add JSON/MaybeXS to dependencies, replacing JSON/Any
2018-08-30 18:30:33 -04:00
Isaac Connor
df3da6dd93
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-08-30 14:53:39 -04:00
Andrew Bauer
8f0fb0843a
Add Privacy Statement ( #2194 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* create and load default.php
* fix typos
* fix erroneous copy/paste
2018-08-30 13:25:02 -04:00
Jonathan Lassoff
c605769fc9
Add Control plugin for PTZ cameras supporting the PSIA IP Media Device API
2018-08-28 15:28:52 +00:00
Isaac Connor
f2d4739838
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-24 17:11:39 -04:00
Isaac Connor
627d47980a
prevent killall zombies by ignoring SIGCHLD at startup
2018-08-22 16:33:11 -04:00
Isaac Connor
1fa78c5aa8
Fix up licensing and copyright
2018-08-17 08:14:13 -04:00
Isaac Connor
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
.
2018-08-13 15:33:43 -04:00
Andrew Bauer
56f4d768c2
Add Privacy Statement ( #2176 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* push privacy text to all language files
2018-08-13 15:23:44 -04:00
Isaac Connor
e6d1a9447e
rename TVIP862 to Trendnet and delete TVIP672WI
2018-08-13 11:12:15 -04:00
Isaac Connor
67a3ff392b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-13 11:07:13 -04:00
Isaac Connor
70ba0ad342
Merge https://github.com/michaelbarkdoll/ZoneMinder into trendnet
2018-08-13 11:05:50 -04:00
Andrew Bauer
3dc424282b
Support quoting config variables ( #2175 )
...
* allow handling of quotes in config files
* copy paste error
* surround zm_arptool in quotes
2018-08-11 12:56:16 -04:00
Isaac Connor
3962c52288
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-09 11:23:37 -04:00
Isaac Connor
dbdb9680c0
exit on HUP to free up memory.
2018-08-07 11:32:17 -04:00
Isaac Connor
683789eb41
Merge branch 'master' into storageareas
2018-08-03 10:27:48 -04:00
Isaac Connor
82833a152e
exit on HUP to free up memory.
2018-08-02 06:53:18 -04:00
Isaac Connor
50c7eec0ff
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-02 05:25:53 -04:00
Andrew Bauer
6ad732e419
retrieve greip data rather than the ip ( #2173 )
2018-07-31 14:01:01 -04:00
Roman Dissertori
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
Isaac Connor
7e63b322c1
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-07-22 09:58:15 -04:00
Daedilus
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
Andrew Bauer
455204135d
fail if zm_path_ffmpeg not set
2018-07-17 06:57:38 -05:00
Isaac Connor
d3034670a0
Merge branch 'master' into storageareas
2018-07-10 11:03:33 -04:00
Dmitry Smirnov
756369f2d8
JSON::Any --> JSON::MaybeXS ( Closes : #770 ). ( #2151 )
2018-07-10 10:27:03 -04:00
Andrew Bauer
add3682128
fix spelling
2018-07-05 08:00:24 -05:00
Isaac Connor
76abad0a96
escape {} in regexp
2018-07-01 18:19:11 -04:00
Isaac Connor
e98a4b1562
Merge branch 'master' into storageareas
2018-06-25 14:31:00 -04:00
Isaac Connor
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
Andrew Bauer
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
Isaac Connor
fd72689182
Spacing, quotes. Main thing is to delete Object cache on HUP
2018-06-21 10:49:51 -04:00
Isaac Connor
3cb5ef6a94
Spacing
2018-06-21 10:00:54 -04:00
Andrew Bauer
3ffd30ffbd
Allow selection of different source column filtering on the console ( #2132 )
2018-06-20 11:12:43 -04:00
Isaac Connor
a594a1b6f1
Merge branch 'master' into storageareas
2018-06-15 09:45:11 -04:00
Isaac Connor
fef88107e1
Close the db before forking in start()
2018-06-14 14:54:00 -04:00
Isaac Connor
f5026542f8
retest STDERR for terminal output on reinit. Simplify databaseLevel code to clear dbh always when not NOLOG.
2018-06-11 16:05:57 -04:00
Isaac Connor
d5d206f00a
Force disconnect when reinitialize Logging
2018-06-11 15:57:38 -04:00
Isaac Connor
65a5af6f92
remove extra space
2018-06-11 15:49:39 -04:00
Isaac Connor
e32b432fea
Always re-connect to the db on initialize
2018-06-11 14:35:54 -04:00
Isaac Connor
a4ade03e6f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-06-11 14:08:19 -04:00
Isaac Connor
d1f658bf30
minor spacing changes, remove unused Server lookup
2018-06-11 14:07:49 -04:00
Isaac Connor
48f8118e5a
put back logReInit
2018-06-10 15:01:20 -04:00
Isaac Connor
578efb3a76
Need to do reaper in shutdownALl
2018-06-10 14:21:09 -04:00
Andrew Bauer
982f5e2442
fix typo
2018-06-10 12:15:26 -05:00
Andrew Bauer
9da5759063
Merge pull request #2117 from connortechnology/simplify_reaper
...
rework reaper
2018-06-09 20:20:07 -05:00
Isaac Connor
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
Isaac Connor
934ce654f9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-06-08 15:21:43 -04:00
Isaac Connor
f5f4649886
Fix #2100
2018-06-08 15:14:11 -04:00
Isaac Connor
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
Isaac Connor
be26f14566
put back zmsystemctl.pl
2018-06-08 14:59:14 -04:00
Isaac Connor
374123f9c2
get rid of debugging and turn of extra logReInit
2018-06-08 14:21:27 -04:00
Isaac Connor
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
Andrew Bauer
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
Isaac Connor
d589d31f74
Merge branch 'master' into storageareas
2018-06-08 09:30:21 -04:00
Isaac Connor
e88c73195d
Merge branch 'fix_perl_logging' into storageareas
2018-06-08 09:30:16 -04:00
Isaac Connor
d30d8efaf0
clear stored sth on initialize and re-initialize
2018-06-08 09:17:25 -04:00
Isaac Connor
7c32e4d86c
Move zmDbConnect up before logInit because the db handle got closed
2018-06-08 09:15:19 -04:00
Isaac Connor
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
Andrew Bauer
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
Isaac Connor
be61c50efa
Fix setting Debug option when ZM_LOG_DEBUG_TARGET is empty and fix setting effectiveLevel
2018-06-07 17:25:02 -04:00
Isaac Connor
20bef5f381
Remove unused Server loading and debug statements
2018-06-07 09:57:54 -04:00
Isaac Connor
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
Isaac Connor
2b00f1d166
Merge ../ZoneMinder.master into storageareas
2018-06-06 13:06:41 -04:00
Isaac Connor
b3c9f508f4
Remove debugging line that is causing systemd to fail
2018-06-06 11:40:12 -04:00
Isaac Connor
627ee8aeb3
close syslog in order to not leak ram
2018-06-04 14:59:42 -04:00
Isaac Connor
21e26c8c14
Spacing and parenthesis and some debug lines
2018-05-31 10:25:16 -04:00
Isaac Connor
2eb3c8ef6d
use a stored prepared sth instead of re-preparing it
2018-05-31 10:24:54 -04:00
Isaac Connor
c98339e152
Google code style, list monitor in debug line listing LastWriteTime
2018-05-24 10:49:20 -04:00
Isaac Connor
13e11a1e7f
Fix potention div vy zero
2018-05-22 15:52:12 -04:00
Isaac Connor
b445ddc981
typo fix
2018-05-12 14:36:53 -07:00
Isaac Connor
4bbd8d6ab9
Use zmDbConnect in Database instead of duplicating all the connect code
2018-05-12 14:36:38 -07:00
Isaac Connor
5071fd1ba1
Add mysql_auto_reconnect and force autocommit on
2018-05-12 14:35:43 -07:00
Isaac Connor
1fed8f3428
finish handling a change of Realm. Actually makes it unneccessary to specify the Realm in ControlDevice
2018-05-11 13:14:54 -04:00
Isaac Connor
16e63f81df
fully specify ZoneMinder::Database::ZmDbConnect
2018-05-11 12:42:56 -04:00
Isaac Connor
a86b81d12e
Only set term_sent_at if we don't already have one, we may send the stop signal many times
2018-05-08 16:08:24 -04:00
Isaac Connor
e6d11bf147
block CHLD signals in send_stop, to prevent race condition
2018-05-08 15:52:33 -04:00
Isaac Connor
593167dee6
remove extra code killing processes after KILL_DELAY. check_for_processes_to_kill will kill everything off.
2018-05-08 15:29:34 -04:00
Isaac Connor
62b9662b48
Handle when process is not in cmd_hash
2018-05-08 14:12:53 -04:00
Isaac Connor
6bff8811e7
put back logReinit after forko
2018-05-08 12:52:40 -04:00
Isaac Connor
5242b17b03
Done restartPending message should be a debug, not Info
2018-05-08 10:30:12 -04:00
Isaac Connor
d9b6f4bd85
test for value in DBI::errstr
2018-05-04 16:00:55 -04:00
Isaac Connor
dbdf937a56
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-04 06:47:23 -07:00
Isaac Connor
8f45b50947
handle null and include errstr
2018-05-04 06:46:24 -07:00
Isaac
84c94efaa8
Move redunddant close methods into parent. Use Fatal instead of croak. Croak is not defined so it causes an infinite loop
2018-05-04 02:26:25 +02:00
Isaac Connor
769d4a8693
DB connect can die, so put it in an eval
2018-05-03 09:50:54 -07:00
Isaac Connor
62f6e4a78a
Cleanup lock_and_load add some debug
2018-05-03 09:30:44 -07:00
Isaac Connor
095f4614da
don't move event if there are no files. Add some more debug
2018-05-03 09:30:06 -07:00
Isaac Connor
a1fb944afe
google code style and increase the logging level when reporting that the ControlDevice is wrong.
2018-05-02 11:45:52 -04:00
Isaac Connor
1f5c2e2ff7
show ping value when not connected to db
2018-05-02 11:38:48 -04:00
Isaac Connor
59d5297b4b
fix wrong order calculating time we have waited for process to die.
2018-05-01 12:08:31 -04:00
Isaac Connor
04198aa381
Log valu of dbh if not connected
2018-04-30 15:09:13 -04:00
Isaac Connor
f4b6bde3c2
Put print to STDERR before logging to db because it is more reliable than db
2018-04-30 13:02:43 -04:00
Isaac Connor
8e5ee94420
If we fail to connect, the dbh->trace will crash
2018-04-30 13:02:13 -04:00
Isaac Connor
d3a611ae49
google code style. sth does not have a errstr() method.
2018-04-30 07:56:51 -07:00
Isaac Connor
3f05d46012
Merge zmdc.pl fixes. We can now handle database disconnects gracefully.
2018-04-30 07:09:23 -07:00
Isaac Connor
a4da624f4c
break out of loops when zm-terminate is set
2018-04-27 13:20:38 -07:00
Isaac Connor
348468a98d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-26 22:09:48 -04:00
Isaac Connor
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
Isaac Connor
a35412f71d
Merge ../ZoneMinder.master
2018-04-26 21:58:01 -04:00
Andrew Bauer
86b2f6a12e
New Monitor Type - Website ( #2065 )
...
* implement website monitor
* don't check certain fields when using website monitor
* continue to fix javascript errors for website monitors
* check $monitor, not $new_monitor here
* add website monitor documentation
was somehow left out of the initial commit
* fix corruption of functions.php
* add missing comma
* remove errors by testing for existence of key. If it's a new monitor, then none of the keys will be valid
* If the monitor type is WebSite, then default Status to Running.
* put back start function that got lost in merge. Don't start StreamCmd's if it's a WebSite
* Add midding comma
* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite
* Don't show control or any of the status fields for WebSite type monitors
* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
Isaac Connor
356badf21d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-04-26 11:57:46 -04:00
Isaac Connor
00e82fb751
Implement MonitoServerId,StorageServerId,FilterServerID in Filters
2018-04-25 13:05:19 -07:00
Isaac Connor
f2073c958f
more debug
2018-04-25 10:33:42 -07:00
Isaac Connor
27531750a4
Google code style
2018-04-25 10:48:50 -04:00
Isaac Connor
93ad25e124
rework zmdc.pl to better handle killing processes
2018-04-24 11:41:04 -04:00
Isaac Connor
cc77561826
fix last_event being uint64
2018-04-24 11:40:38 -04:00
Isaac Connor
a68ed3a305
watchfeed => watch. Fixes #2086
2018-04-23 11:38:25 -04:00
Isaac Connor
e3161687ba
google code style
2018-04-23 11:16:37 -04:00
Isaac Connor
f752b3077a
add the # of seconds before kill to the log line
2018-04-23 11:16:24 -04:00
Isaac Connor
a868bb70ed
Better debug when fail to attach images
2018-04-20 15:56:14 -04:00
Isaac Connor
1d4e79feb1
Update filters a bit, using Event as an object to get the Path, etc
2018-04-20 15:22:31 -04:00
Isaac Connor
5a93458441
add StartTime to Filters
2018-04-20 15:22:12 -04:00
Isaac Connor
64c3c21564
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2018-04-19 14:22:23 -04:00
Isaac Connor
2516846176
only update DiskSpace if new DiskSpace is defined
2018-04-19 14:22:19 -04:00
Isaac Connor
e6525ce59e
Introduce a level param, and use it to turn on checks that shouldn't need to be done anymore, due to foreign keys
2018-04-19 08:18:23 -07:00
Isaac Connor
5fe7b3f55f
increase process kill time to 100 secs. zma can sometimes take this long
2018-04-19 08:17:37 -07:00
Isaac Connor
477e96a4a6
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-19 07:46:28 -07:00
Isaac Connor
d9a035a45d
Remove commit that is unneccesary
2018-04-19 07:38:39 -07:00
Isaac Connor
696b17e92e
include path to where we are not deleting from in teh debug output
2018-04-19 07:37:11 -07:00
Isaac Connor
c7f672fabd
SIGNAL_CHECK_POINTS is now a per-monitor setting
2018-04-19 09:59:10 -04:00
Isaac Connor
d01682f3ad
remove second use
2018-04-18 21:46:55 -04:00
Isaac Connor
c27aa5efea
Need to actually export CpuLoad
2018-04-18 21:44:37 -04:00
Isaac Connor
6dae6d8949
fix doubled use
2018-04-18 21:29:35 -04:00
Isaac Connor
fcaac016b5
Merge ../ZoneMinder.connortechnology
2018-04-18 21:12:14 -04:00
Isaac Connor
70b8188cc1
make MoveTo more efficient by bailing early if it has already been moved. Also add a check for it's Old storage area changing.
2018-04-18 13:48:01 -07:00
Isaac Connor
00b7ae9006
put in missing my
2018-04-18 10:07:50 -04:00
Isaac Connor
1040afbda4
change message about not deleting files for speed
2018-04-18 09:27:11 -04:00
Isaac Connor
bfe82e297a
Default an empty Storage to doing Deletes
2018-04-18 09:26:36 -04:00
Andrew Bauer
04cb1f9300
use ZoneMinder::Server::CpuLoad rather than Sys:CpuLoad ( #2080 )
2018-04-17 21:09:41 -04:00
Isaac Connor
7e7e353a8c
Use a more efficient SQL when finding Orphaned Frames
2018-04-17 08:47:11 -07:00
Isaac Connor
05fdc51be0
Fix Sql caching
2018-04-14 15:05:05 -04:00
Isaac Connor
925f640118
Fix Filters using a cached SQL
2018-04-14 11:09:01 -04:00
Isaac Connor
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07:00
Isaac Connor
9fde052d39
merge
2018-04-03 14:41:32 -07:00
Isaac Connor
793f630ee0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-02 10:43:07 -07:00
Pliable Pixels
e5505de1d1
fixed brace styling
2018-03-29 11:27:31 -04:00
Pliable Pixels
d64e58e374
silly mistake - wrong names
2018-03-29 11:23:35 -04:00
Pliable Pixels
95eb1d3045
merged master storage areas, resolved conflicts
2018-03-29 08:51:35 -04:00
Pliable Pixels
990d60926e
#92 new key
2018-03-29 08:47:55 -04:00
Isaac Connor
31963dcd16
say how big the file was
2018-03-28 13:41:16 -07:00
Isaac Connor
9d5dcd7b0c
return to indicate success of load
2018-03-28 08:56:03 -07:00
Isaac Connor
3e7bc46bf9
Add Amazon S3 file deletion. Add bandwidth use in file move.
2018-03-28 08:21:57 -07:00