From 8e7ec934d366a528ceff68c7dd9c8330836b043d Mon Sep 17 00:00:00 2001 From: Jan Stabenow Date: Fri, 11 Nov 2022 00:27:58 +0100 Subject: [PATCH] Mod indicates a faulty cache configuration --- CHANGELOG.md | 1 + src/views/Settings.js | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2d6f4f..dd4da0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Add scale filter to non-hwaccel encoders - Add PeerTube and Media Network to publication services (plattforms, software) - Add reset button to hide a player logo ([#431](https://github.com/datarhei/restreamer/issues/431)) +- Mod indicates a faulty cache configuration - Mod switches to the improved SRT syntax (thx to SA Consulting) - Mod improves display of progress data - Mod removes deprecated param ocl - now ochl (ff5) diff --git a/src/views/Settings.js b/src/views/Settings.js index 2ee5ae4..80df78b 100644 --- a/src/views/Settings.js +++ b/src/views/Settings.js @@ -1414,6 +1414,7 @@ export default function Settings(props) { HTTP port} env={env('address')} disabled={env('address')} @@ -1427,6 +1428,7 @@ export default function Settings(props) { HTTPS port} env={env('tls.address')} disabled={env('tls.address') || !config.tls.auto} @@ -1485,6 +1487,7 @@ export default function Settings(props) { Maximum viewers} env={env('sessions.max_sessions')} disabled={env('sessions.max_sessions')} @@ -1501,6 +1504,7 @@ export default function Settings(props) { Maximum bandwidth Mbit/s} env={env('sessions.max_bitrate_mbit')} disabled={env('sessions.max_bitrate_mbit')} @@ -1650,7 +1654,7 @@ export default function Settings(props) { Maximum viewer idle time (Seconds)} env={env('sessions.session_timeout_sec')} disabled={env('sessions.session_timeout_sec') || !config.sessions.enable} @@ -1733,6 +1737,7 @@ export default function Settings(props) { Maximum size (Megabytes)} env={env('storage.memory.max_size_mbytes')} disabled={env('storage.memory.max_size_mbytes')} @@ -1777,6 +1782,7 @@ export default function Settings(props) { Maximum size (Megabytes)} value={config.storage.disk.max_size_mbytes} env={env('storage.memory.max_size_mbytes')} @@ -1811,11 +1817,24 @@ export default function Settings(props) { Maximum size (Megabytes)} env={env('storage.disk.cache.max_size_mbytes')} disabled={env('storage.disk.cache.max_size_mbytes') || !config.storage.disk.cache.enable} value={config.storage.disk.cache.max_size_mbytes} onChange={handleChange('storage.disk.cache.max_size_mbytes')} + error={ + parseInt(config.storage.disk.cache.max_file_size_mbytes) > parseInt(config.storage.disk.cache.max_size_mbytes) && + parseInt(config.storage.disk.cache.max_size_mbytes) !== 0 + } + helperText={ + parseInt(config.storage.disk.cache.max_file_size_mbytes) > parseInt(config.storage.disk.cache.max_size_mbytes) && + parseInt(config.storage.disk.cache.max_size_mbytes) !== 0 ? ( + Must be larger than maximum file size in cache + ) : ( + '' + ) + } /> @@ -1824,6 +1843,7 @@ export default function Settings(props) { Cache time (Seconds)} env={env('storage.disk.cache.ttl_seconds')} disabled={env('storage.disk.cache.ttl_seconds') || !config.storage.disk.cache.enable} @@ -1837,11 +1857,24 @@ export default function Settings(props) { Maximum file size (Megabytes)} env={env('storage.disk.cache.max_file_size_mbytes')} disabled={env('storage.disk.cache.max_file_size_mbytes') || !config.storage.disk.cache.enable} value={config.storage.disk.cache.max_file_size_mbytes} onChange={handleChange('storage.disk.cache.max_file_size_mbytes')} + error={ + parseInt(config.storage.disk.cache.max_file_size_mbytes) > parseInt(config.storage.disk.cache.max_size_mbytes) && + parseInt(config.storage.disk.cache.max_size_mbytes) !== 0 + } + helperText={ + parseInt(config.storage.disk.cache.max_file_size_mbytes) > parseInt(config.storage.disk.cache.max_size_mbytes) && + parseInt(config.storage.disk.cache.max_size_mbytes) !== 0 ? ( + Must be smaller than maximum cache size + ) : ( + '' + ) + } /> @@ -1925,6 +1958,7 @@ export default function Settings(props) { RTMP Port} env={env('rtmp.address')} disabled={env('rtmp.address') || (!config.rtmp.enable && !config.rtmp.enable_tls)} @@ -1938,6 +1972,7 @@ export default function Settings(props) { RTMPS Port} env={env('rtmp.address_tls')} disabled={env('rtmp.address_tls') || !config.rtmp.enable_tls || !config.tls.auto} @@ -1999,6 +2034,7 @@ export default function Settings(props) { Port} env={env('srt.address')} disabled={env('srt.address') || !config.srt.enable} @@ -2128,6 +2164,7 @@ export default function Settings(props) { Maximum log lines} value={config.log.max_lines} env={env('log.max_lines')} @@ -2146,6 +2183,7 @@ export default function Settings(props) { Maximum log lines} value={config.ffmpeg.log.max_lines} env={env('ffmpeg.log.max_lines')} @@ -2159,6 +2197,7 @@ export default function Settings(props) { Maximum log histroy} value={config.ffmpeg.log.max_history} env={env('ffmpeg.log.max_history')}