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
|
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 |
|
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
|
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
|
b3c9f508f4
|
Remove debugging line that is causing systemd to fail
|
2018-06-06 11:40:12 -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 |
|