e33b41745d
Merge branch 'master' into replace_function_concept
2022-02-27 14:04:01 -05:00
1d15de0534
Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options
2022-02-27 14:03:48 -05:00
13251b133a
Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options
2022-02-27 14:03:37 -05:00
46c43ca508
Revert "Fix fmt=>Fmt and add it's libs to list of libraries to link to"
...
This reverts commit d5101ef32a
2022-02-27 13:46:52 -05:00
c5b9ed9451
Revert "Fix zms build"
...
This reverts commit e6b36bb186
2022-02-27 13:46:51 -05:00
57da477f69
Revert "Install fmt-devel"
...
This reverts commit fad152e93d
2022-02-27 13:46:50 -05:00
c3485a6840
Revert "Add libfmt-dev"
...
This reverts commit d8eaaa4a50
2022-02-27 13:46:32 -05:00
d8eaaa4a50
Add libfmt-dev
2022-02-27 11:07:10 -05:00
fad152e93d
Install fmt-devel
2022-02-27 10:53:07 -05:00
e6b36bb186
Fix zms build
2022-02-27 10:41:42 -05:00
d5101ef32a
Fix fmt=>Fmt and add it's libs to list of libraries to link to
2022-02-27 10:41:40 -05:00
90d930c7c3
Merge pull request #3119 from Carbenium/fmt
...
Add fmt library for type-safe string formatting
2022-02-27 10:37:41 -05:00
47fae7a296
spacing, improve debug
2022-02-26 19:18:28 -05:00
0bcb9d276f
code style.
2022-02-26 18:25:51 -05:00
914581bc57
add libavdevice-dev and libgsoap-dev to build
2022-02-26 18:25:51 -05:00
2bd85089f4
Put integers in quotes as well. Proper JSON has all values in quotes. This is important because integers like 0123 are invalid
2022-02-26 18:25:51 -05:00
cad57df0bb
Merge branch 'master' into fmt
2022-02-26 13:56:20 -05:00
6fc5803e16
Add another clearInterval to prevent looping during window.location
2022-02-25 15:54:56 -05:00
9b0714d20d
Fix use of value instead of val in filter term
2022-02-25 14:14:02 -05:00
813fd36b0a
clearInterval when location.replacing so that timer stops. Prevents infinite loop
2022-02-25 14:13:18 -05:00
372e493b9c
Merge pull request #3442 from BHMSD-bdailey/lazy-load-images
...
Lazy load images
2022-02-22 08:57:49 -05:00
b2428b5522
Merge branch 'master' into lazy-load-images
2022-02-22 08:47:26 -05:00
831dca814f
Include EndDateTimeShort in event stats
2022-02-22 08:31:41 -05:00
dfb6a96b42
Handle empty endtime more gracefully. If there is a next event just jump to it.
2022-02-22 08:31:41 -05:00
959b08f46a
Include EndDateTimeShort in event ajax response
2022-02-22 08:31:41 -05:00
347d3c08b6
Spacing, remove dead code, add comments. When implementing CLOSE_ALARM mode, check Alarm Frames against alarm_frame_count instead of 0.
2022-02-22 08:31:41 -05:00
968acc2d43
Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed.
2022-02-22 08:31:41 -05:00
26d89292d7
Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed.
2022-02-22 08:31:41 -05:00
e9b3269278
cleanup and add fallback to read/write if no sendfile support.
2022-02-22 08:31:41 -05:00
00b4ed9c53
Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed. Use new reworked zm_sendfile and handle if not all bytes are sent. Fixes #3437 .
2022-02-22 08:31:41 -05:00
d7c8e32ec9
Remove non-translations
2022-02-22 08:31:41 -05:00
0da942a14b
rework zm_sendfile to try again if not all bytes were sent. According to the docs, this is entirely possible.
2022-02-22 08:31:41 -05:00
88a68af775
DefaultCodec is for event view, not live
2022-02-22 08:31:41 -05:00
cf7b3b9f9f
DefaultCodec is for event view, not live
2022-02-22 08:31:41 -05:00
bcd590aede
use rockylinux:8 container for ci workflow
2022-02-22 08:31:41 -05:00
b5e2cb4220
include arp-scan polkit files in rpm
2022-02-22 08:31:41 -05:00
2c7e90d61d
bump rpm specfile rtsp commit
...
anytime the rtsp commit is bumped in packpack, it must also be bumped in the rpm specfile
2022-02-22 08:31:41 -05:00
3a2e5a580b
Debug the contents of REQUEST on every hit.
2022-02-22 08:31:41 -05:00
5aef8408a4
serialize form instead of just passing filter id because the modal can now handle unsaved filters
2022-02-22 08:31:41 -05:00
b32164e992
Add handling of NOT IN and =\[\] and \!\[\]
2022-02-22 08:31:41 -05:00
e523777ece
Sync up n_frames, frame_count, curr_frame_id on int instead of a mix of long int, int and unsigned long int
2022-02-22 08:31:41 -05:00
e4f5f59e8d
3 more img tags
2022-02-22 08:31:41 -05:00
ce267c7e3c
Most programmatic images are lazy.
2022-02-22 08:31:02 -05:00
fc21fb643e
Release lock before notify
2022-02-20 10:33:13 -05:00
02ccf13c7b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-02-20 10:32:43 -05:00
b896974a29
Should get lock before testing for connected
2022-02-20 10:32:40 -05:00
f4412c81d1
Merge pull request #3441 from peat-psuwit/for-upstream/dbqueue-stop-mutex
...
db: fix dead lock in zmDbQueue::stop()
2022-02-20 10:32:19 -05:00
a40b305065
Merge branch 'master' into replace_function_concept
2022-02-20 09:52:03 -05:00
ebe502a747
db: fix dead lock in zmDbQueue::stop()
...
Notifying `mCondition` without taking the lock causes a race condition
in ::process() between checking `mTerminate` and waiting for the
`mCondition`, which causes a dead lock. This commit moves writing to
`mTerminate` and notifying `mCondition` under the lock to eliminate race
condition and dead lock.
This is not theoretical. It has caused zmu to hang at exit on a
Raspberry Pi 4, exhuasting PHP-FPM process pool. The stacks below are
captured when running ZoneMinder 1.36.12-focal1 on Ubuntu 20.04:
(gdb) thread apply all bt
Thread 2 (Thread 0xffff80c1c880 (LWP 259988)):
#0 futex_wait_cancelable (private=0, expected=0, futex_word=0xaaaae0584e80 <dbQueue+176>) at ../sysdeps/nptl/futex-internal.h:183
#1 __pthread_cond_wait_common (abstime=0x0, clockid=0, mutex=0xaaaae0584e28 <dbQueue+88>, cond=0xaaaae0584e58 <dbQueue+136>) at pthread_cond_wait.c:508
#2 __pthread_cond_wait (cond=0xaaaae0584e58 <dbQueue+136>, mutex=0xaaaae0584e28 <dbQueue+88>) at pthread_cond_wait.c:638
#3 0x0000ffff8700d670 in std::condition_variable::wait(std::unique_lock<std::mutex>&) () from /lib/aarch64-linux-gnu/libstdc++.so.6
#4 0x0000aaaae0438f08 in zmDbQueue::process (this=0xaaaae0584dd0 <dbQueue>) at ./src/zm_db.cpp:250
#5 0x0000ffff87013fac in ?? () from /lib/aarch64-linux-gnu/libstdc++.so.6
#6 0x0000ffff891264fc in start_thread (arg=0xffffe60d84bf) at pthread_create.c:477
#7 0x0000ffff86dd767c in thread_start () at ../sysdeps/unix/sysv/linux/aarch64/clone.S:78
Thread 1 (Thread 0xffff80c23010 (LWP 259987)):
#0 __pthread_clockjoin_ex (threadid=281472841926784, thread_return=0x0, clockid=0, abstime=<optimized out>, block=<optimized out>) at pthread_join_common.c:145
#1 0x0000ffff87014240 in std:🧵 :join() () from /lib/aarch64-linux-gnu/libstdc++.so.6
#2 0x0000aaaae04314d0 in exit_zmu (exit_code=0) at ./src/zmu.cpp:200
#3 0x0000aaaae042f4c8 in main (argc=<optimized out>, argv=<optimized out>) at ./src/zmu.cpp:797
2022-02-20 09:58:03 +00:00
fe69261f10
Include MonitorId as second argument of EventStartCommand and EventEndCOmmand at @baudneo's request.
2022-02-19 15:33:05 -05:00
Isaac Connor
Isaac Connor
Ben Dailey
Andrew Bauer
Ratchanan Srirattanamet