Commit Graph

1832 Commits

Author SHA1 Message Date
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
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
Isaac c5332a255b Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-21 21:11:28 +01:00
Isaac fedd67a7f6 add to_string 2018-01-21 21:11:05 +01:00
Isaac Connor 6d46a02a9a DbReconnect if the db connection goes down 2018-01-19 18:25:24 -05:00
Isaac Connor 43d72decac Turn off extra debugging 2018-01-19 18:24:59 -05:00
Isaac Connor 2682686063 Must disconnect and reconnect before calling update script 2018-01-19 16:32:26 -05:00
Isaac Connor dfce773341 We should return the value of DiskSpace 2018-01-19 13:32:28 -05:00
Isaac 62704601ca We should return the value of DIskSpace 2018-01-19 19:22:43 +01:00
Isaac Connor e8603b6065 Use coalesce to handle NULLs 2018-01-19 13:08:13 -05:00
Isaac Connor 8935b77a12 Add a CTRL-C INT handler as well. Log more info about deleting events 2018-01-19 12:14:36 -05:00