Commit Graph
1303 Commits
Author SHA1 Message Date
IgorA100 9200eb42e9 Add ReadStat() Refactoring CpuUsage()
CPU load calculation
2024-02-27 17:32:03 +03:00
IgorA100 d25a07eb04 Fix: ... 2024-02-26 23:19:28 +03:00
IgorA100 871ca68024 Changing uptime return line parsing for CpuLoad()
Changing uptime return line parsing for CpuLoad()
Depending on the locale it could be like this:
16:50:53 up 1 day, 1:10, 3 users, load average: 0.89, 0.94, 1.14
or like this:
16:50:53 up 1 day, 1:10, 3 users, load average: 0.89, 0.94, 1.14
2024-02-26 17:06:23 +03:00
Isaac Connor 15cdb9e816 Merge branch 'master' into event_start_mode 2024-02-22 10:47:49 -05:00
Isaac Connor 8f35339198 Fix StorageServerId value 2024-02-22 09:06:54 -05:00
Isaac Connor 91aeeb4d60 Fix support for FilterServerId 2024-02-21 16:34:25 -05:00
Isaac Connor 48774d3c31 Handle undefined sort field 2024-02-21 10:06:17 -05:00
Isaac Connor 93ef297c24 Implement CpuUsage to get data either from /proc/stat or top output. 2024-02-20 13:12:50 -05:00
Isaac Connor d32b4809af Add duration mode to eventclosemode 2024-02-17 10:49:25 -05:00
Isaac Connor 3bbc01858d Add codec in mp4 prevent recovery. Use oldest file time to set Event StartTime 2024-02-05 17:40:20 -05:00
Charlie Root bb8fccea26 Only require Date::Manip if using strtotime 2024-01-24 14:22:27 -08:00
Isaac Connor c8980c7529 Clean up termLevel() removing stupid code 2024-01-16 09:43:43 -05:00
Isaac Connor 1d7c69522b Fix duplicated inner join on Monitors 2024-01-12 13:35:17 -05:00
Isaac Connor 72778bd76d Remove circular reference in Control(), free shm if allocated in destructor 2024-01-11 13:59:10 -05:00
Isaac Connor e99f49fcb5 Fix NewPath missing / 2024-01-09 15:34:50 -05:00
Isaac Connor 13114b2e83 Only do joins if required. Use a subselect on Tags because it is way more efficient that doing the joins. 2024-01-08 17:23:50 -05:00
Isaac Connor 7f03a84b35 When instantiating an object, and given the data, refresh the cache instead of using an old cached object. This should fix issues with Events where cached properties like Storage and Path use an old value. 2024-01-08 10:02:56 -05:00
Isaac Connor 9e2a4335d1 Even objects can have cached properties, so add an undef in calls to Storage and Path so that they get recalculated. This should fix invalid errors about Event already being moved, when in fact it hasn't. 2024-01-05 10:43:33 -05:00
Isaac Connor 9024e5a479 Include backtrace info when logging sql error 2024-01-04 10:16:07 -05:00
Isaac Connor d1c52987bd Add returning both the sth and res 2023-12-19 12:16:36 -05:00
Isaac Connor 29b16a5384 Implement zmDbExecute which is slightly more useful than zmSQLExecute 2023-12-19 10:54:22 -05:00
Isaac Connor 591e900fcf Remove debug 2023-12-18 11:39:52 -05:00
Isaac Connor 803cc8bc1a Add zmDbSupportsFeature with skip_locked support 2023-12-05 09:42:01 -05:00
Isaac Connor 6bf0533341 Better logging, only commit if no error. 2023-12-04 14:17:18 -05:00
Isaac Connor 983ccb7afc Add support for double in zmMemWrite 2023-12-03 10:37:53 -05:00
Isaac Connor 3627a4e97d Add ZM_WEB_VIEWING_TIMEOUT config setting for each bw profile. 2023-11-20 13:25:26 -05:00
Isaac Connor d62779b1e8 Include command that failed in Error. 2023-11-16 13:06:52 -05:00
Isaac Connor 939db57fa9 When command fails, log at Warning instead of Debug. 2023-11-16 13:06:29 -05:00
Isaac Connor eb6baf4365 Importance is an enum, default value should be Normal 2023-10-23 12:51:29 -04:00
Isaac Connor eb291b76d1 Better log message when we have a weird value for Importance 2023-10-23 12:49:12 -04:00
Isaac Connor 582245cdaf Rework new and find to properly handle multi-column primary keys 2023-10-04 17:07:50 -04:00
Isaac Connor 69e6c56ac3 Add Objects for Tag, Event_Tag and add functions to Event to load them. 2023-10-04 17:07:19 -04:00
Isaac Connor 3836e7d2a7 The value will be the Tag ID so compare against T.Id not T.Name 2023-10-04 15:57:54 -04:00
Isaac Connor fc2198d375 Update Path after changing Storage Area 2023-10-04 10:07:07 -04:00
Isaac Connor 87d29f10c6 Use new ZM_PATH_UNAME instead of uname on PATH 2023-09-28 12:59:28 -04:00
Isaac Connor 243edcc82f Use new ZM_PATH_RM instead of hard coding path to rm 2023-09-28 12:59:08 -04:00
Isaac Connor 92d3e00db1 Add GROUP BY E.Id to fix mysql complaining about teh aggregate function 2023-09-20 13:35:51 -04:00
Isaac Connor 25dfbf27f6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-09-18 17:05:56 -04:00
Isaac Connor 82a7dca63b SELECTING auto_increment value doesn't work. Must use mysql_insertid 2023-09-18 17:05:10 -04:00
Isaac Connor b22ef6f328 Use a subselect instead of join because newer mysql doesn't like the aggregate functions without telling it how to group the other columns 2023-09-18 09:59:46 -04:00
Simpler1 18d74ed7ac (feat): Tags
fix(tag): Create tags on mobile

chore(tags): Change TagName to Name

chore(tags): eslint

chore(tags): dbFetchAll to dbQuery for removetag

chore(events): eslint (attempt 2)

feat(tags): Better handling of keyboard

fix(tags): Enter key for creating new tag

fix(tags): Don't allow space as a tag name

feat(tags): Delete tag if last assignment removed

fix(tags): Increase height of dropdown

in progress

fix(Tags): Use T.Id on the events page dropdown

fix(Tags): Remove $availableTags from events.php

chore(sql): Formatting sql statements

feat(Tags): Working OR on filters and events pages

fix(filter): Populate availableTags

chore(Tags): code formatting

fix(tag): Add tag on create tag

Fix(tags): Remove tag from available if last

feat(tags): Add zm_update.sql

fix(chosen): Undo css width

fix(chosen): tags dropdown width

fix(tags): dropdown over timeline

fix(tags): Full width input

fix(events): Refresh table on page show

chore(filter): Clean up availableTags

chore(event): Clean up available & selected Tags

fix(event): Update available tags on remove

fix(event): Remove hack for selected tags

feat(tags): Blur input after adding tag

doc(tags): Initial tags documentation

fix(tags): Dark theme dropdown

fix(tags): Dark theme for tags on input

fix(tags): Dark theme for highlight in dropdown

fix(tags): Populate filter tags droplist

chore(): Bump zm_update to 1.37.42

chore(tags): Move mobile check to skin.js

chore(tags): Comment debug statements

fix(tags): Enter key to create tag on mobile Chome

chore(tags): Space in 'All Tags' for translation

Temporary commit to handle cookie expiration times

chore(tags): Remove unnecessary Tag(s) from en_gb

chore(): Cleanup unnecessary Error and Debug

chore(): Resolve merge conflicts

chore(): Address merge conflicts with master
2023-08-31 15:50:08 -04:00
Alejandro Criado-Pérez 6fd119157a Text corrections 2023-08-27 02:00:59 +02:00
Isaac Connor 61d0cec1fa Debug the result of the auth header split, not the same line over and over 2023-08-18 16:56:37 -04:00
Isaac Connor e163509d57 auto_reconnect id deprecated. 2023-08-16 09:53:07 -04:00
Isaac Connor 5b7defb57b Remove warnings about ControlDevice, because that is now channel. Detect duration not being in microseconds and adjust. 2023-08-15 14:02:12 -04:00
Isaac Connor 769f6ce372 Only set channel from the default (1) if ControlDevice is populated 2023-08-08 13:28:18 -04:00
Isaac Connor 206be0ea96 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-08-02 13:36:33 -04:00
Isaac Connor 1628c4fa6b Handle term->val not being defined, and fix the code to strip quotes from the value. 2023-08-02 13:28:44 -04:00
Isaac Connor f1b3bc08c1 Use opendir instead of glob when copying files. For performance reasons. 2023-08-02 13:27:45 -04:00
Isaac Connor 54000bc204 Reduce redundant debugging 2023-08-02 13:05:57 -04:00