a9ed5c1158
escape column names for mysql8. Fixes #2814
2020-01-21 16:53:43 -05:00
766a59884d
Don't hard code perl path. Use PERL_EXECUTABLE cmake var
2019-09-23 12:54:27 -04:00
3368f94c1a
Add code to handleDelay to cancel identical delayed actions. Fixes #2619 ( #2681 )
2019-08-08 14:38:27 -04:00
2e9d72ed63
spacing and extra ()
2019-08-08 14:11:24 -04:00
88e148068e
Logging and whitespace
2018-12-20 13:56:57 -05:00
2fbe1be02b
implement loadMonitor sub ( #2244 )
...
* implement loadMonitor sub
* remove carriabe returns from Info, Warning, Debug statements
2018-10-10 14:27:05 -04:00
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
b3984ea2da
Merge branch 'master' into storageareas
2017-07-14 10:38:20 -04:00
a07f8961d1
add another zmDbConnect at the bottom of the while(1) loop which will ping and reconnect to db if neccessary.
2017-07-14 10:30:12 -04:00
d5a4aaca5d
fix braces, spacing, move pod docs to bottom
2017-07-14 10:28:31 -04:00
7ab6818fa0
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
2017-01-25 17:14:30 -05:00
a5cdfd2932
call loadMonitors at the beginning. Otherwise we may not know about a monitor while handling a message from it.
2017-01-12 13:03:53 -05:00
d9ce1a68c6
restore defaults
2017-01-12 12:56:55 -05:00
65f7350313
remove debug stautement
2017-01-12 12:55:27 -05:00
42484f7680
switch quotes, load monitors at the beginnign
2017-01-12 12:54:40 -05:00
7502b81064
zmMemVerify now checks valid, so don't need to do it again.
2017-01-10 15:32:38 -05:00
04f66917ae
Merge branch 'fix_mmap_leak' into storageareas
2017-01-10 15:29:54 -05:00
7ddd5359d0
zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good
2017-01-10 15:09:30 -05:00
4d84387807
Merge branch 'fix_mmap_leak' into work
2017-01-10 14:22:58 -05:00
a66e9e45a2
merge a fix from storageareas that adds a test for the shared data being valid and reloads the monitors if it can't reconnect
2017-01-10 14:22:42 -05:00
d2ff6701f4
test
2017-01-10 13:53:02 -05:00
b3c5f4622f
revert knnniggett's zmMemDetach changes
2017-01-10 12:56:19 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
c27d0270dc
Merge branch 'knnniggett-zmMemDetach' into storageareas
2016-12-20 15:40:14 -05:00
c6368c4a1a
replace zmMemInvalidate with zmMemDetach
2016-12-20 13:49:07 -06:00
f0a307e082
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
...
Conflicts:
distros/ubuntu1504_cmake/control
2016-03-29 11:53:17 -04:00
b9085cea64
Fix issue where programs are installed in unexpected paths.
...
For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
2016-03-11 14:28:16 -07:00
4606d2fbca
Update zmtrigger.pl.in
...
mention the %Q placholder when using showtext
2016-03-10 10:13:38 -06:00
0fce33b2d3
one too many curly brackets
2016-02-22 06:59:14 -06:00
a2e06ed70c
Prevent zmtrigger from crashing when memory handles change
2016-02-21 17:55:04 -06:00
826a22a2a8
add missing .
2016-02-19 11:07:06 -05:00
3b07b56400
Use more descriptive names for the channels
2016-02-19 11:05:55 -05:00
66c66106f5
Process off+time delay condition
2016-01-15 20:31:31 -06:00
5a363273a2
Merge branch 'master' into multi-server
...
Conflicts:
distros/ubuntu1504/changelog
2015-07-16 16:37:44 -04:00
10adae3696
Merge pull request #941 from ZoneMinder/trigger_on_space
...
add space instead of + to handle old Axis cameras
2015-07-16 13:09:36 -05:00
ad23969982
add space instead of + to handle old Axis cameras
2015-07-16 13:06:15 -04:00
c788d70b93
zmtrigger: POD documentation
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-07-16 18:35:42 +10:00
b8888b9d55
Only load triggers for our Server if ZM_SERVER_ID is set
2015-07-15 16:22:43 -04:00
b0909a4c57
autouse Data::Dumper
2015-04-16 15:48:51 +10:00
fcdd9b6fb5
zmtrigger.pl: comments to POD + readability
2015-04-16 15:48:47 +10:00
a148e04ea2
Update zmtrigger.pl.in
...
zmtrigger.pl should not open serial port #1 by default. There could be situations where other hardware etc. would be attached to the port that is not used by zoneminder.
Better if this can be commented out by default and if a user needs serial access, he can enable it by removing the comment.
This line also gives an permissions error when running on Ubuntu which prevents zmtrigger to start. That error can probably be fixed by adding the zm user permission to the serial port. But the main issue is that if the program does not need access to the port, it should not open it.
2014-04-30 15:07:29 +02:00
d185f05006
robustness/code style changes
2014-01-03 12:55:30 -05:00
3d55dde548
COnfig fixes
2014-01-03 09:33:49 -05:00
6ff385e407
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-21 09:19:10 +00:00
e9865320e7
Prevent memory handles from leaking when polling monitors
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3360 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-25 08:27:46 +00:00
215884ecc5
Added properly constructed path to Unix domain socket
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3221 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-05 17:35:25 +00:00
b944c07f66
Added after bogus delete
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2911 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:22:28 +00:00
b696f637e5
Removed temporarily.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2909 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:18:38 +00:00
11a1cc2d41
Now supports custom perl install path
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:11:56 +00:00
Isaac Connor
Isaac Connor
Andrew Bauer
Andy Bauer
Isaac Connor
Kyle Johnson
Andrew Bauer
Isaac Connor
Dmitry Smirnov
Martin Hagelin
stan