f2d4739838
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-24 17:11:39 -04:00
cd6dd28280
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-08-17 16:15:30 -04:00
376e15b763
trylock was interesting for debugging, but really logging should wait for the lock
2018-08-17 16:04:12 -04:00
871e3807e6
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-17 12:57:27 -04:00
4670a7f26b
move variables into deeper block
2018-08-13 10:01:04 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
934ce654f9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-06-08 15:21:43 -04:00
4454ca0072
Merge branch 'storageareas' into zma_to_thread
2018-05-20 10:39:14 -04:00
038c5f4e1a
log the log line not the uninitialized sql
2018-05-14 13:57:26 -04:00
94377a4652
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:57:50 -04:00
67adad5d5c
use trylock instead of lock because our signal handler may try to log while the db is locked
2018-05-03 13:53:53 -04:00
c8eab2d275
remove debug log to stdout that shouldn't be there. It messes up zms
2018-05-01 09:41:46 -04:00
a4da624f4c
break out of loops when zm-terminate is set
2018-04-27 13:20:38 -07:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
fc38fdcc56
remove extra spaces
2018-04-05 11:30:01 -04:00
ceb12cdd81
undo a debug thing that shouldn't have been committed
2018-04-03 09:12:18 -04:00
a56eafe796
when deleting Logger object, need to reset zmInitialized because we clear all the codes
2018-03-29 12:24:00 -04:00
fd9c93d3e2
add a mutex around logging to db
2018-03-23 14:18:41 -04:00
ccf0336c9d
whitespace
2018-03-22 10:25:56 -04:00
e634e0addc
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-02-17 12:25:42 -05:00
e6d9292dd0
term to terminal for clarity
2018-02-17 12:25:00 -05:00
84b7e85259
Add a mutex around mysql operations
2018-02-15 15:54:13 -05:00
ebb0c9eec6
Merge branch 'storageareas' into zma_to_thread
2018-02-14 13:56:30 -05:00
8ba02d8e0e
Fix re-opening log file. If there was no change in File Log level, then it wouldn't close and reopen, but the filename might have changed, so we have to.
2018-02-14 13:50:16 -05:00
2e11c12d73
add debugging to logging
2018-02-14 11:56:54 -05:00
e83586dbe1
Rename Term to Terminal to differentiate between Terminate
2018-02-13 06:23:18 -05:00
cd596d49e3
fix local camera inputstream
2017-11-17 16:49:01 -05:00
159c0a7165
moer cppcheck fixes
2017-11-17 07:52:26 -05:00
39b12057f2
add saveJPEGs to Events
2017-11-13 21:34:39 -05:00
ef0f01d498
more debug, try to get pts/dts right
2017-11-12 13:16:40 -05:00
fece06c9e3
google code style
2017-10-19 17:12:36 -04:00
3436c65aab
minor logic improvement
2017-10-18 10:22:15 -07:00
fa37a55226
if debug is not on, limit the log level to each destination. This makes checks to meffectivelevel work
2017-09-23 13:41:20 -04:00
daee5b4450
experiment with no ffmpeg thread
2017-08-11 12:03:37 -04:00
536ccc0cec
maybe fix memleak, maybe fix crash
2017-08-10 15:44:20 -04:00
d3ec50aa69
various fixes plus use global db functions in logger
2017-07-06 17:45:23 -04:00
121aba0308
add parenthesis around truth value to quieten compiler
2017-06-29 15:41:21 -04:00
1361b8952f
change mode of opening log files to append instead of overwrite
2017-06-14 10:15:08 -04:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
162cc05a33
when debug is turned on, fflush after every line. Debug logging is almost useless when debugging a crash without this.
2017-06-09 11:05:44 -04:00
ab365dc749
braces
2017-05-20 08:53:27 -04:00
6d6b453b82
Google code style/whitespace
2017-05-19 12:57:43 -04:00
1687217d18
switch to POSIX basename()
2017-01-31 11:10:25 +03:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
6fa3b25d2a
fix whitespace
2016-12-12 21:44:03 -05:00
1f6a6f9758
fix whitespace
2016-12-12 21:43:07 -05:00
9b76a16af4
log failed sql when db insert fails. Also, don't permanently turn off db logging just for one failed insert
2016-12-12 21:41:55 -05:00
2ab79820a1
Add back changes
2016-05-22 08:08:12 -07:00
03b1ced568
tabs to spaces and use 2space indenting
2016-04-04 10:11:48 -04:00
3a18a62bc6
Add ServerId column when inserting log line into database
2015-12-30 08:29:45 -05:00
24b79e81bc
add include for basename on freebsd
2015-10-02 11:00:42 -04:00
14feffc455
strip the path from the filename
2015-08-21 18:28:50 -05:00
2538514d18
Change from info to debug
2015-08-03 18:39:14 -04:00
b91d1c7b0c
Don't die if db goes away during logging
2015-06-03 14:57:19 -04:00
12516da3dc
Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
...
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
209f23cc6e
Fix build issues on kFreeBSD. Fixes #771
2015-04-20 12:53:02 -04:00
3cc4c2e24d
fixes to get pid on FreeBSD
2015-02-24 09:22:08 -05:00
b4732e4750
Close logger and database on exit
2014-11-14 22:17:44 +01:00
e8d20faec8
Proper checking for sys/syscall.h
2013-09-25 07:11:59 +03:00
cdac403fb1
Merge ../zum into develop
...
Conflicts:
AUTHORS
configure.ac
db/zm_create.sql.in
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/zmupdate.pl.in
src/Makefile.am
src/zm_buffer.cpp
src/zm_config_defines.h
src/zm_event.cpp
src/zm_ffmpeg.h
src/zm_ffmpeg_camera.cpp
src/zm_image.cpp
src/zm_jpeg.h
src/zm_local_camera.cpp
src/zm_logger.cpp
src/zm_mem_utils.h
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_mpeg.cpp
src/zm_remote_camera_http.cpp
src/zm_remote_camera_rtsp.cpp
src/zm_rtsp.cpp
src/zm_sdp.cpp
src/zm_sdp.h
src/zm_stream.cpp
src/zm_thread.cpp
src/zm_thread.h
src/zm_threaddata.cpp
src/zm_user.cpp
src/zm_user.h
src/zm_utils.cpp
src/zm_zone.cpp
src/zm_zone.h
web/includes/actions.php
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/js/skin.js
web/skins/classic/views/js/monitor.js.php
web/skins/classic/views/monitor.php
web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
84370b7fd8
add unistd.h include to fix compile
2013-04-29 12:51:46 -04:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
2c87c43978
Use dedicated DB connection for logging, with auto reconnect set up.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3474 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-28 11:07:35 +00: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
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Andrew Bauer
abishai
Andy Bauer
Isaac Connor
josh4trunks
Isaac Connor
Andrew Bauer
Linwood-F
Rick Sayre
Isaac Connor
manupap1
mastertheknife
Isaac Connor
nextime
stan