vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 01:26:11 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

pytz debug #596

Browse Source
This commit is contained in:
Jokob-sk
2024-03-20 08:16:12 +11:00
parent de5e120042
commit 5584512bcc
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dockerfiles/setup.sh
View File

@@ -34,23 +34,23 @@ fi
cp -na "${INSTALL_DIR}/pialert/back/pialert.conf" "${INSTALL_DIR}/pialert/config/pialert.conf" cp -na "${INSTALL_DIR}/pialert/back/pialert.conf" "${INSTALL_DIR}/pialert/config/pialert.conf"
cp -na "${INSTALL_DIR}/pialert/back/pialert.db" "${FILEDB}" cp -na "${INSTALL_DIR}/pialert/back/pialert.db" "${FILEDB}"
# if custom variables not set we do not need to do anything
if [ -n "${TZ}" ]; then
FILECONF="${INSTALL_DIR}/pialert/config/pialert.conf"
echo "[INSTALL] Setup timezone"
sed -i "\#^TIMEZONE=#c\TIMEZONE='${TZ}'" "${FILECONF}"
fi
# # if custom variables not set we do not need to do anything # # if custom variables not set we do not need to do anything
# if [ -n "${TZ}" ]; then # if [ -n "${TZ}" ]; then
# FILECONF=$INSTALL_DIR/pialert/config/pialert.conf # FILECONF="${INSTALL_DIR}/pialert/config/pialert.conf"
# if [ -f "$FILECONF" ]; then # echo "[INSTALL] Setup timezone"
# sed -ie "s|Europe/Berlin|${TZ}|g" $INSTALL_DIR/pialert/config/pialert.conf # sed -i "\#^TIMEZONE=#c\TIMEZONE='${TZ}'" "${FILECONF}"
# else
# sed -ie "s|Europe/Berlin|${TZ}|g" $INSTALL_DIR/pialert/back/pialert.conf_bak
# fi
# fi # fi
# if custom variables not set we do not need to do anything
if [ -n "${TZ}" ]; then
FILECONF=$INSTALL_DIR/pialert/config/pialert.conf
if [ -f "$FILECONF" ]; then
sed -ie "s|Europe/Berlin|${TZ}|g" $INSTALL_DIR/pialert/config/pialert.conf
else
sed -ie "s|Europe/Berlin|${TZ}|g" $INSTALL_DIR/pialert/back/pialert.conf_bak
fi
fi
echo "[INSTALL] Setup NGINX" echo "[INSTALL] Setup NGINX"
echo "Setting webserver to address ($LISTEN_ADDR) and port ($PORT)" echo "Setting webserver to address ($LISTEN_ADDR) and port ($PORT)"
envsubst '$INSTALL_DIR $LISTEN_ADDR $PORT' < "${INSTALL_DIR}/pialert/install/pialert.template.conf" > "${NGINX_CONFIG_FILE}" envsubst '$INSTALL_DIR $LISTEN_ADDR $PORT' < "${INSTALL_DIR}/pialert/install/pialert.template.conf" > "${NGINX_CONFIG_FILE}"

19
front/js/pialert_common.js
View File

@@ -229,7 +229,7 @@ function cacheStrings()
function getString (key) { function getString (key) {
// handle initial laod to make sure everything is set-up and cached // handle initial laod to make sure everything is set-up and cached
handleFirstLoad() handleFirstLoad(getString)
UI_LANG = getSetting("UI_LANG"); UI_LANG = getSetting("UI_LANG");
@@ -1084,6 +1084,8 @@ function arraysContainSameValues(arr1, arr2) {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// initialize // initialize
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
// Define a unique key for storing the flag in sessionStorage // Define a unique key for storing the flag in sessionStorage
var sessionStorageKey = "myScriptExecuted_pialert_common"; var sessionStorageKey = "myScriptExecuted_pialert_common";
@@ -1130,17 +1132,18 @@ $.get('api/app_state.json?nocache=' + Date.now(), function(appState) {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Display spinner and reload page if not yet initialized // Display spinner and reload page if not yet initialized
function handleFirstLoad() function handleFirstLoad(callback)
{ {
if(!pialert_common_init) if(!pialert_common_init)
{ {
setTimeout(function() { setTimeout(function() {
location.reload(); callback();
}, 1000); }, 1000);
} }
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Check if the code has been executed before by checking sessionStorage // Check if the code has been executed before by checking sessionStorage
var pialert_common_init = sessionStorage.getItem(sessionStorageKey) === "true"; var pialert_common_init = sessionStorage.getItem(sessionStorageKey) === "true";
@@ -1152,7 +1155,7 @@ function executeOnce() {
resetInitializedFlag() resetInitializedFlag()
showSpinner()
// to keep track of completed AJAX calls // to keep track of completed AJAX calls
completedCalls = [] completedCalls = []
@@ -1162,6 +1165,14 @@ function executeOnce() {
cacheSettings(); cacheSettings();
cacheStrings(); cacheStrings();
initDeviceListAll_JSON(); initDeviceListAll_JSON();
showSpinner()
// reload ONCE after all caches initialized
setTimeout(() => {
location.reload()
}, 500);
} }
} }