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
Isaac Connor
ddeb2e61ef
add error logging
2018-02-18 11:29:15 -05:00
Isaac Connor
e634e0addc
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-02-17 12:25:42 -05:00
Isaac Connor
6883350e47
spacing/quotes/google code style. Always close and reopen logfile, as the filename may have changed
2018-02-15 10:00:13 -05:00
Isaac Connor
af003227c3
Don't do day/hour/week/month totals from main events table anymore
2018-02-13 11:41:35 -05:00
Isaac Connor
6cfce1d5f2
Improve logging
2018-02-13 11:27:20 -05:00
Isaac Connor
0f2cf65039
adjust kill timeouts. Give each process up to 10 seconds to exit
2018-02-13 06:21:39 -05:00
Isaac Connor
62b0a1ecdc
Add some debugging to tell what we are doing
2018-02-12 13:25:11 -05:00
Isaac Connor
c0eb0011f0
Make some errors just errors instead of fatal. Add a check for plural days in log cleaning
2018-02-11 14:18:10 -05:00
Isaac Connor
956f9ee193
if there is a custom term handler in place, call it when Fatal
2018-02-11 14:17:44 -05:00
Isaac
208d563e11
fix Event => __git_main[0]
2018-02-09 02:09:00 +01:00
Isaac Connor
069d53a9a0
Add the object debug when path to event does not exist in DiskSpace
2018-02-07 08:02:37 -05:00
flashoftheblades
630dde26d1
Add files via upload
2018-02-05 18:52:05 -05:00
Isaac Connor
8e547134d5
Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl
2018-02-03 14:50:19 -05:00
Isaac Connor
e25af4b40c
cleanup, reset result
2018-02-02 16:07:13 -05:00
Isaac Connor
f702b37445
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2018-02-02 12:09:03 -05:00
Isaac Connor
8e8b6bdc36
Select Events by StorageArea
2018-02-02 12:08:54 -05:00
Isaac Connor
0287868f5e
include the status when error runCommand
2018-02-02 11:06:47 -05:00
Isaac Connor
87ef17dddc
errors running a command should NOT exit!
2018-02-02 11:05:56 -05:00
Isaac Connor
2861779249
move zmonvif-probe.pl from the onvif library code and update it to use ZoneMinder::ONVIF
2018-01-31 16:57:17 -05:00
Isaac Connor
c96f47886c
Fix discover not picking up a 1.2 response if we already have a 1.1
2018-01-31 16:56:46 -05:00
Isaac Connor
4933b37b69
fix log levels
2018-01-30 10:45:32 -05:00
Isaac Connor
aea1816e8e
Add in signal handlers to as to complete an action before exiting.
2018-01-30 09:19:08 -05:00
Isaac Connor
9f5c8078fc
handle when reading the link returns nothing
2018-01-29 21:16:41 -05:00
Isaac Connor
3c635d2f6a
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-26 13:07:59 -08:00
Isaac Connor
7fc29fe681
List starttime of orphaned event
2018-01-26 16:07:26 -05:00
Isaac Connor
e824f0abfe
use a big Y to indicate that hitting enter will result in Y. Also list q as an option to quit
2018-01-26 16:05:43 -05:00
Isaac Connor
30404203ea
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-26 12:54:56 -08:00
Isaac Connor
a12030fda7
Handle no storageareas found
2018-01-26 12:54:54 -08:00
Isaac Connor
2f39e44f91
Finish implementing single monitor mod
2018-01-26 15:53:47 -05:00
Isaac Connor
209093a4c6
Improve debug output
2018-01-26 10:32:37 -05:00
Isaac Connor
0bd1ee5992
Merge branch 'master' into m
2018-01-25 08:43:31 -05:00
Isaac Connor
c930a7cce6
fix crash
2018-01-24 15:29:49 -05:00
Isaac Connor
e4c900a868
Use a LEFT JOIN on Storage WHEN Running Filters
2018-01-24 12:34:06 -05:00
Isaac Connor
1800c6fcf0
Add locking around Event deletion
2018-01-24 12:16:34 -05:00
Isaac Connor
cf4ac74d02
If failed to delete from Frames or Stats, return instead of deleting the event.
2018-01-24 10:45:42 -05:00
Isaac
83371d0f21
Fix Error => Debug
2018-01-23 17:42:57 +01:00
Simpler1
ce19c65cc9
Ipcc ( #2040 )
...
* fix(ipcc): Invert up/down to work properly
* fix(ipcc): Change the initial values for ipcc camera
2018-01-22 15:33:11 -05:00
Isaac Connor
e60a86a061
improve debug output
2018-01-22 15:26:18 -05:00
Isaac Connor
37ff7c3779
Add finding by Id to Event
2018-01-22 15:26:01 -05:00
Isaac Connor
2068a5c684
Add object caching
2018-01-22 15:25:51 -05:00
Isaac Connor
d63594b5fa
don't do updates in a transaction so we don't hold locks
2018-01-22 14:06:52 -05:00
Isaac Connor
94fc8013c6
use a smarter glob to pick up events that were Deep, when the storage area is now Medium.
2018-01-22 11:10:31 -05:00
Isaac Connor
b317748796
Add Server loading
2018-01-22 11:09:49 -05:00
Isaac Connor
493a2386c4
Only load Time from StartTime if it has a value. Parse Path to get LInkPath if no Time.
2018-01-22 11:09:35 -05:00
Isaac
63351b5494
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-21 23:18:45 +01:00
Isaac Connor
a67c34fcad
Allow specifiying storagearea to audit
2018-01-21 17:14:32 -05:00