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
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
Isaac Connor
124d2b20eb
remove version control marker
2018-03-21 10:51:47 -04:00
Isaac Connor
f682e1da9e
Merge branch 'zmtelemetry_improvements' into storageareas
2018-03-21 10:40:32 -04:00
Isaac Connor
c34ab7c172
fix merge and sleep for interval instead of 1 hour
2018-03-21 09:28:39 -04:00
Isaac Connor
0d3957611a
Merge branch 'zmtelemetry_improvements' of github.com:ConnorTechnology/ZoneMinder into zmtelemetry_improvements
2018-03-21 09:26:54 -04:00
Isaac Connor
b50fd690dc
exit if not enabled, hence reducing code nesting. Must update lastCheck
2018-03-21 09:22:29 -04:00
Isaac Connor
ba7b2447a2
Merge branch 'master' into zmtelemetry_improvements
2018-03-21 09:07:43 -04:00
Isaac Connor
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
Isaac Connor
79b10b0166
Use Event.Width and Event.Height instead of Monitor.Width and Monitor.Height when generating video of an event.
2018-03-14 10:09:31 -04:00
Pliable Pixels
704ccaee73
2059 alarm cause ( #2060 )
...
* added alarm_cause as a test
* initial attempt to integrate with notes
* testing sizeof
* add zone labels
* fixed typo
* fixed typo
* comments and formatting
* Downgraded invalid attribute to error
* Removed Error downgrade. Instead do a undefined check on field params
* Added help text
2018-03-12 19:38:12 -04:00
Isaac Connor
fa01dbf6af
use parent's new and AUTOLOAD methods
2018-03-09 09:19:26 -05:00
Andy Bauer
b41363fd60
Merge branch 'patch-3' of https://github.com/habibapp1365/zoneminder into habibapp1365-patch-3
2018-03-06 11:37:49 -06:00
habibapp1365
50a63c7899
Create DCS3415.pm
...
D-Link DCS-3415 IP Control Protocol
2018-03-06 11:31:39 +03:30
Isaac Connor
3aa31fd524
Merge branch 'master' into storageareas
2018-02-23 10:23:35 -05:00
Isaac Connor
3eaf95c607
handle Storage reload request
2018-02-21 14:09:51 -05:00
Isaac Connor
449ac87af1
force reload on Storage in Event object when moving
2018-02-21 14:09:12 -05:00
Isaac Connor
af560b8291
SIG{TERM} can be empty
2018-02-19 15:14:36 -05:00